From cf9b77dbb3d764223cc6d18c75d7dcb56d0eb530 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Sat, 5 Mar 2011 10:37:32 +0300 Subject: [PATCH] Update calculate client. --- sys-apps/calculate-client/ChangeLog | 7 ++ sys-apps/calculate-client/Manifest | 4 +- .../calculate-client-2.2.9-r2.ebuild | 73 +++++++++++++++++++ ...calculate-client-2.2.9-exclude_trash.patch | 13 ++++ sys-apps/calculate-utilities/ChangeLog | 10 +++ sys-apps/calculate-utilities/Manifest | 2 + .../calculate-utilities-2.2.9-r1.ebuild | 36 +++++++++ 7 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 sys-apps/calculate-client/calculate-client-2.2.9-r2.ebuild create mode 100644 sys-apps/calculate-client/files/calculate-client-2.2.9-exclude_trash.patch create mode 100644 sys-apps/calculate-utilities/ChangeLog create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.9-r1.ebuild diff --git a/sys-apps/calculate-client/ChangeLog b/sys-apps/calculate-client/ChangeLog index 00261814c..4152026da 100644 --- a/sys-apps/calculate-client/ChangeLog +++ b/sys-apps/calculate-client/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-client-2.2.9-r2 (05 Mar 2011) + + 05 Mar 2011; Mike Hiretsky (mhiretskiy) + +calculate-client-2.2.9-r2.ebuild, + +files/calculate-client-2.2.9-exclude_trash.patch: + Update calculate-client for exclude trash. + *calculate-client-2.2.9-r1 (11 Feb 2011) 11 Feb 2011; Alexander Tratsevskiy (L'autre) diff --git a/sys-apps/calculate-client/Manifest b/sys-apps/calculate-client/Manifest index 8ecab3f65..c3e01eb23 100644 --- a/sys-apps/calculate-client/Manifest +++ b/sys-apps/calculate-client/Manifest @@ -1,7 +1,9 @@ +AUX calculate-client-2.2.9-exclude_trash.patch 624 RMD160 f76e63ca219bb6373e27a162567b46aaf18ae159 SHA1 b9c0dba4c261776244e4ae1f8645847e907db27f SHA256 891121ed4554d03fd169f8ecd79be1fee5b9fb49bba862998c07067cfd8dc348 DIST calculate-client-2.2.8.tar.bz2 35129 RMD160 bcfa1f5734ca9887f688d69ba1e786f06e39858b SHA1 6e34bb936f7d6d7502c99da0c8b24d39b480db9f SHA256 d4baa5eef6be6e5089bc88e42879c6dc9bb34b551931243d5854e9b40d315c5e DIST calculate-client-2.2.9.tar.bz2 35132 RMD160 67521d32d903465caf6428b7ae7223ca33f2b794 SHA1 14060238b526796a8222581a0e4a2e6abeb352ec SHA256 c5f32fe956eb44826dfa4f66e27c10c4e27202a78acbd29a447dc36bd89fce52 EBUILD calculate-client-2.2.8.ebuild 1737 RMD160 c1537f99e4cd4f25b09099e8872deeeef2ee430f SHA1 939439e75b0f098dd205f552dfa02ca4d18b9723 SHA256 8c533832c21547443c430b33170482715474b3d1b4004b37fc551637b36889cb EBUILD calculate-client-2.2.9-r1.ebuild 1715 RMD160 d6a2c280c172e09f5981398d1abf6e6dbc807e99 SHA1 189ff85820f0355fb58dbe56e558a3aafc3430f8 SHA256 cbf07ae79e382aeba5699ab7228ee21e59690d39ad8be21de84f2d044375987e +EBUILD calculate-client-2.2.9-r2.ebuild 1848 RMD160 62da8e0eb644d13f50119bce797df93896aec493 SHA1 3f10502120fb3c1644683de0ddd147e9f02a541b SHA256 6ded3fefeb8a3cdaf5295f1a25720f0c0d8c0744ebdf0757861e760545158061 EBUILD calculate-client-2.2.9999.ebuild 1718 RMD160 f88304830d176bde5e48389c59664fd4f810a1f3 SHA1 d4c1a942e988304a2b5dee4842932e6b360a9f65 SHA256 86a88789729dd8c68d662d62c61dbe13cfeca74a6b1e6f1c878f6cb67f60dc41 -MISC ChangeLog 16032 RMD160 ecc1e4675c0a304dc8dc8884968ba71b92da864d SHA1 40f175b8e6d1c96d510571e13845a5d687d627cd SHA256 19b1fd950c5f161be4866fb3197ad58ed3e3d814bfb8f9170f9e87f7ea0c867c +MISC ChangeLog 16270 RMD160 79d4025cb53f31551f73bcfc5b34e0133b5e2afb SHA1 a921c745685d402fdf9ef3eaeb104d055b654e73 SHA256 ee40b892fbcad687692a645c2bf47c43f42340c0a8e59469e55781bc3565dbfd MISC metadata.xml 310 RMD160 ed986dbc43c958bd57e0fb73749ee09167ee0221 SHA1 4007f716df1aa85ec65d926f246663effc382384 SHA256 5023605d36dcbb5d5fe1b1ac54f7125a4087479b5168601075a8050ed51c38c2 diff --git a/sys-apps/calculate-client/calculate-client-2.2.9-r2.ebuild b/sys-apps/calculate-client/calculate-client-2.2.9-r2.ebuild new file mode 100644 index 000000000..3eff63274 --- /dev/null +++ b/sys-apps/calculate-client/calculate-client-2.2.9-r2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +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.9 + ~sys-apps/calculate-lib-2.2.9 + >=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}" + +ISUPDATE=/tmp/${PN}.ebuild.update + +# for fixing bug of ebuild calculate-client-2.0.17 +OLDISUPDATEPATH="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17/temp/" +OLDISUPDATE="${OLDISUPDATEPATH}/${PN}.update" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # backport from 2.2.9 + epatch "${FILESDIR}/calculate-client-2.2.9-exclude_trash.patch" +} + +pkg_preinst() { + touch ${ISUPDATE} + rm -f /etc/init.d/client + + # for fixing bug of ebuild calculate-client-2.0.17 + mkdir -p ${OLDISUPDATEPATH} + touch ${OLDISUPDATE} +} + +pkg_postinst() { + #/usr/lib/calculate-2.2/calculate-client/bin/install + rm ${ISUPDATE} + + # for fixing bug of ebuild calculate-client-2.0.17 + rm -rf ${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17 + rmdir ${PORTAGE_TMPDIR}/portage/${CATEGORY} &>/dev/null + einfo "For configure calculate-client perform:" + einfo " cl-client --install" +} + +pkg_prerm() { + # for fixing bug of ebuild calculate-client-2.0.17 (|| -e ${OLDISUPDATE} ) + if ! [[ -e ${ISUPDATE} || -e ${OLDISUPDATE} ]]; + then + : + #/usr/lib/calculate-2.2/calculate-client/bin/uninstall + fi +} diff --git a/sys-apps/calculate-client/files/calculate-client-2.2.9-exclude_trash.patch b/sys-apps/calculate-client/files/calculate-client-2.2.9-exclude_trash.patch new file mode 100644 index 000000000..500a71e52 --- /dev/null +++ b/sys-apps/calculate-client/files/calculate-client-2.2.9-exclude_trash.patch @@ -0,0 +1,13 @@ +diff --git a/pym/cl_vars_client.py b/pym/cl_vars_client.py +index b3a7794..fb738ba 100644 +--- a/pym/cl_vars_client.py ++++ b/pym/cl_vars_client.py +@@ -77,7 +77,7 @@ class Data: + ".local/share/mime/mime.cache", ".gvfs", + ".kde4/share/apps/nepomuk/repository/main/data", ".logout", + ".Xauthority", ".thumbnails", ".mozilla/firefox/*/Cache", +- ".kde4/socket-*", ".cache/"]} ++ ".kde4/socket-*", ".cache/", ".local/share/Trash"]} + + # Директории или файлы которые удаляются + # при синхронизации профиля пользователя diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog new file mode 100644 index 000000000..f1602008f --- /dev/null +++ b/sys-apps/calculate-utilities/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for sys-apps/calculate-utilities +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*calculate-utilities-2.2.9-r1 (05 Mar 2011) + + 05 Mar 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.9-r1.ebuild: + Update deps. + diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 7c427a4d4..118da469e 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -1 +1,3 @@ +EBUILD calculate-utilities-2.2.9-r1.ebuild 827 RMD160 403b1ade7438d0d1a2558af3c1f4825cad47f026 SHA1 b4215902dd5550f1af37516984eafc0f7b5356da SHA256 76076e498268e58e52dc85940cc565c6e960f4db118e12ee438356c1512e5087 EBUILD calculate-utilities-2.2.9.ebuild 827 RMD160 c62546891ead80e1cac33429ddb43cdf5dace57f SHA1 106ad4656826622e6e18c00146f79d312782c654 SHA256 a564a96b6b56dd528f827a2b6815432c1ea0e7c856d6896506bc2871aa5c8e3b +MISC ChangeLog 290 RMD160 d87e1c1fdafedfe90e2892eae6cef50d81f52c32 SHA1 e36dec2e68082fab2d1bc349505112c4d0c9adf3 SHA256 2dcb0d3db777ea0255d51b0dd96076bbee3965cdb1e694121817ea7e31100aa7 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.9-r1.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.9-r1.ebuild new file mode 100644 index 000000000..e3f91835e --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.9-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +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.9 + =sys-apps/calculate-templates-2.2.9-r1 + =sys-apps/calculate-lib-2.2.9 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.9-r1 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.9 ) + cl_client? ( =sys-apps/calculate-client-2.2.9-r2 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.9 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.9 ) + + cl_server? ( =sys-apps/calculate-server-2.1.13 ) +" +