parent
649bf49c0f
commit
eb371ba754
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${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="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-2.2.23
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Fix translate
|
||||
epatch "${FILESDIR}/calculate-client-2.2.23-r1.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-client perform:"
|
||||
einfo " cl-client --install"
|
||||
}
|
||||
@ -0,0 +1,65 @@
|
||||
diff --git pym/cl_client.py pym/cl_client.py
|
||||
index 66b2ac0..97486bc 100644
|
||||
--- pym/cl_client.py
|
||||
+++ pym/cl_client.py
|
||||
@@ -1980,8 +1980,8 @@ class client(share, commandServer, encrypt):
|
||||
if remoteHost:
|
||||
self.printERROR(_("The computer is already in the domain %s")\
|
||||
%remoteHost)
|
||||
- self.printWARNING(_("Before joining the domain, \
|
||||
-you need to remove it from the previous domain"))
|
||||
+ self.printWARNING(_("Before joining the domain, "
|
||||
+ "you need to remove it from the previous domain"))
|
||||
self.printWARNING(_("Run 'cl-client -r'"))
|
||||
return False
|
||||
|
||||
@@ -2324,7 +2324,7 @@ you need to remove it from the previous domain"))
|
||||
return False
|
||||
self.printOK(_("Changed password of user %s")%os.environ["USER"] + \
|
||||
" ...")
|
||||
- self.printWARNING(_("Password will be changed when you logout from the \
|
||||
-X session"))
|
||||
+ self.printWARNING(_("Password will be changed when you logout from the"
|
||||
+ " X session"))
|
||||
return True
|
||||
|
||||
diff --git pym/cl_client_cmd.py pym/cl_client_cmd.py
|
||||
index f7375a5..fdf510a 100644
|
||||
--- pym/cl_client_cmd.py
|
||||
+++ pym/cl_client_cmd.py
|
||||
@@ -26,8 +26,8 @@ lang().setLanguage(sys.modules[__name__])
|
||||
USAGE = _("%prog [options] domain")
|
||||
|
||||
# Коментарии к использованию программы
|
||||
-COMMENT_EXAMPLES = _("Adds settings for connecting to domain \
|
||||
-server.calculate.ru")
|
||||
+COMMENT_EXAMPLES = _("Adds settings for connecting to domain "
|
||||
+ "server.calculate.ru")
|
||||
|
||||
# Пример использования программы
|
||||
EXAMPLES = _("%prog server.calculate.ru")
|
||||
diff --git pym/cl_sync_cmd.py pym/cl_sync_cmd.py
|
||||
index f96c331..53847f2 100644
|
||||
--- pym/cl_sync_cmd.py
|
||||
+++ pym/cl_sync_cmd.py
|
||||
@@ -36,14 +36,14 @@ DESCRIPTION = _("Mounting resources and synchronize the user profile")
|
||||
|
||||
# Опции командной строки
|
||||
CMD_OPTIONS = [{'longOption':"login",
|
||||
- 'help':_("mount user resource and synchronize the user \
|
||||
-profile")},
|
||||
+ 'help':_("mount user resource and synchronize the user "
|
||||
+ "profile")},
|
||||
{'longOption':"logout",
|
||||
- 'help':_("synchronize the user profile and umount user \
|
||||
-resource")},
|
||||
+ 'help':_("synchronize the user profile and umount user "
|
||||
+ "resource")},
|
||||
{'longOption':"nosync",
|
||||
- 'help':_("not synchronize the user preferences, is used \
|
||||
-in conjunction with the 'login' or 'logout'")},
|
||||
+ 'help':_("not synchronize the user preferences, is used "
|
||||
+ "in conjunction with the 'login' or 'logout'")},
|
||||
{'longOption':"set"},
|
||||
{'longOption':"progress",
|
||||
'help':_("show progress bar for xdm startup")}]
|
||||
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${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="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.23
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Add --verbose
|
||||
epatch "${FILESDIR}/calculate-desktop-2.2.23-r1.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
|
||||
einfo "For configure calculate-desktop perform:"
|
||||
einfo " cl-desktop --install"
|
||||
if use kde || use xfce || use gnome
|
||||
then
|
||||
einfo " /etc/init.d/xdm restart"
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Update for desktop
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.23-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="Templates for calculate utilities 2.2"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-2.2.23"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix gimp configuration
|
||||
epatch "${FILESDIR}/calculate-templates-2.2.23-r2.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
:
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /usr/share/calculate/templates
|
||||
insinto /usr/share/calculate/templates
|
||||
doins -r *
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
diff --git builder/squash/etc/init.d/calculate builder/squash/etc/init.d/calculate
|
||||
new file mode 100644
|
||||
index 0000000..35c0c98
|
||||
--- /dev/null
|
||||
+++ builder/squash/etc/init.d/calculate
|
||||
@@ -0,0 +1,3 @@
|
||||
+# Calculate format=patch cl_builder_live_set==off
|
||||
+<reg>LANG=C /usr/bin/cl-install --startup --live</reg>
|
||||
+<text>LANG=C /usr/bin/cl-install --startup</text>
|
||||
diff --git desktop/desktop/99-final/.dmrc desktop/desktop/99-final/.dmrc
|
||||
index 1406119..0894b2b 100644
|
||||
--- desktop/desktop/99-final/.dmrc
|
||||
+++ desktop/desktop/99-final/.dmrc
|
||||
@@ -1,2 +1,2 @@
|
||||
-# Calculate path=~ name=.dmrc append=remove
|
||||
+# Calculate path=~ name=.dmrc append=remove belong(calculate-desktop)!=
|
||||
# To delete a file necessary when changing the system
|
||||
diff --git install/1merge/Desktop/300-ImageEdit/gimp/calculate/zzz-gimp-2.6.11.desktop install/1merge/Desktop/300-ImageEdit/gimp/calculate/zzz-gimp-2.6.11.desktop
|
||||
new file mode 100644
|
||||
index 0000000..71984f2
|
||||
--- /dev/null
|
||||
+++ install/1merge/Desktop/300-ImageEdit/gimp/calculate/zzz-gimp-2.6.11.desktop
|
||||
@@ -0,0 +1,9 @@
|
||||
+# Calculate format=kde link=/usr/share/applications/zzz-gimp.desktop name=calculate-imageedit.desktop mirror pkg(media-gfx/gimp)>=2.6.11&&exists(/usr/share/applications/zzz-gimp.desktop)!=
|
||||
+
|
||||
+# Update info
|
||||
+#-ini(desktop.imageedit, gimp)-#
|
||||
+
|
||||
+# Hide icon
|
||||
+[Desktop Entry]
|
||||
+OnlyShowIn=X-NeverShowThis;
|
||||
+
|
||||
diff --git install/1merge/gimp/.calculate_directory install/1merge/gimp/.calculate_directory
|
||||
new file mode 100644
|
||||
index 0000000..d2e799d
|
||||
--- /dev/null
|
||||
+++ install/1merge/gimp/.calculate_directory
|
||||
@@ -0,0 +1,2 @@
|
||||
+# Calculate belong()!=&&pkg(media-gfx/gimp)!= path=/etc name=env.d
|
||||
+
|
||||
diff --git install/1merge/gimp/99gimp install/1merge/gimp/99gimp
|
||||
new file mode 100644
|
||||
index 0000000..615128e
|
||||
--- /dev/null
|
||||
+++ install/1merge/gimp/99gimp
|
||||
@@ -0,0 +1,3 @@
|
||||
+# discard /usr/lib64/gimp/2.0/plug-ins/hot due to an segfault prelink
|
||||
+# prelink (20110106-20110511), gimp (2.6.11) (CLD-64)
|
||||
+PRELINK_PATH_MASK=/usr/lib64/gimp/2.0/plug-ins/hot
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=3
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="
|
||||
cl_assemble
|
||||
cl_builder
|
||||
cl_client
|
||||
cl_desktop
|
||||
cl_installgui
|
||||
cl_server
|
||||
"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-2.2.23
|
||||
=sys-apps/calculate-templates-2.2.23-r2
|
||||
=sys-apps/calculate-lib-2.2.23
|
||||
=sys-apps/calculate-i18n-2.2.23-r2
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.23 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.23-r2 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.23-r1 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.23-r1 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.23 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
|
||||
"
|
||||
Loading…
Reference in new issue