From eb371ba754091db16ae90749dcbfd435721a45a2 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 6 Sep 2011 15:38:35 +0400 Subject: [PATCH] Update utilities. --- sys-apps/calculate-client/ChangeLog | 6 ++ sys-apps/calculate-client/Manifest | 4 +- .../calculate-client-2.2.23-r1.ebuild | 42 +++++++++++ .../files/calculate-client-2.2.23-r1.patch | 65 ++++++++++++++++ sys-apps/calculate-desktop/ChangeLog | 7 ++ sys-apps/calculate-desktop/Manifest | 4 +- .../calculate-desktop-2.2.23-r1.ebuild | 42 +++++++++++ .../files/calculate-desktop-2.2.23-r1.patch | 74 +++++++++++++++++++ sys-apps/calculate-i18n/ChangeLog | 6 ++ sys-apps/calculate-i18n/Manifest | 4 +- .../calculate-i18n-2.2.23-r2.ebuild | 33 +++++++++ .../files/calculate-i18n-2.2.23-r2.patch | 58 +++++++++++++++ sys-apps/calculate-templates/ChangeLog | 7 ++ sys-apps/calculate-templates/Manifest | 4 +- .../calculate-templates-2.2.23-r2.ebuild | 37 ++++++++++ .../files/calculate-templates-2.2.23-r2.patch | 49 ++++++++++++ sys-apps/calculate-utilities/ChangeLog | 6 ++ sys-apps/calculate-utilities/Manifest | 3 +- .../calculate-utilities-2.2.23-r3.ebuild | 36 +++++++++ 19 files changed, 482 insertions(+), 5 deletions(-) create mode 100644 sys-apps/calculate-client/calculate-client-2.2.23-r1.ebuild create mode 100644 sys-apps/calculate-client/files/calculate-client-2.2.23-r1.patch create mode 100644 sys-apps/calculate-desktop/calculate-desktop-2.2.23-r1.ebuild create mode 100644 sys-apps/calculate-desktop/files/calculate-desktop-2.2.23-r1.patch create mode 100644 sys-apps/calculate-i18n/calculate-i18n-2.2.23-r2.ebuild create mode 100644 sys-apps/calculate-i18n/files/calculate-i18n-2.2.23-r2.patch create mode 100644 sys-apps/calculate-templates/calculate-templates-2.2.23-r2.ebuild create mode 100644 sys-apps/calculate-templates/files/calculate-templates-2.2.23-r2.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.23-r3.ebuild diff --git a/sys-apps/calculate-client/ChangeLog b/sys-apps/calculate-client/ChangeLog index 1cebb4440..b5dca5d89 100644 --- a/sys-apps/calculate-client/ChangeLog +++ b/sys-apps/calculate-client/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-client-2.2.23-r1 (06 Sep 2011) + + 06 Sep 2011; Mike Hiretsky (mhiretskiy) + +calculate-client-2.2.23-r1.ebuild, +files/calculate-client-2.2.23-r1.patch: + Update for fix translate + *calculate-client-2.2.23 (05 Sep 2011) 05 Sep 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-client/Manifest b/sys-apps/calculate-client/Manifest index 5f8412342..df9598942 100644 --- a/sys-apps/calculate-client/Manifest +++ b/sys-apps/calculate-client/Manifest @@ -1,3 +1,4 @@ +AUX calculate-client-2.2.23-r1.patch 2886 RMD160 99cb8f4bed5e34da1686ad4e718d3c60644433fa SHA1 699aea622d3928d43aa6b455f8cc956750235724 SHA256 c91df84b5288deafeff69612d8f5def070003004741824392e4126061ff1f3cf DIST calculate-client-2.2.18.tar.bz2 37446 RMD160 adeb047706ac3eb760a1128f6a8a7ae1b845f008 SHA1 d72cbea968bf054aa125e5bf367edf4c9e599178 SHA256 d741541dc3c3e7f7540f08e243dbe8b17369d019bb45dacf93ab3d81aba4b749 DIST calculate-client-2.2.19.tar.bz2 31456 RMD160 10e0cf7d0a2c62ce56474f64249afd58d459a629 SHA1 64d4b53f8867c44e27ba2dd7a05d7a9573b6dae8 SHA256 07136f3343f874582e6bc901a4ef17b46b61ca3a1390fdee800b99d2fb1d3e8c DIST calculate-client-2.2.20.tar.bz2 31442 RMD160 fa437088326986cc32b02607f9fb33577678903c SHA1 8df857e255fd2c858eadc0dd19cb39664453e295 SHA256 c7c526a5b9666cfffba8b94af13c97feb7287df67a8c6d7c7b7f24e4232b7445 @@ -9,7 +10,8 @@ EBUILD calculate-client-2.2.19.ebuild 1685 RMD160 ed31d82c683677be0db50613485787 EBUILD calculate-client-2.2.20.ebuild 1685 RMD160 ac88f805b2038fd3034f7f76b42500606b3b9db0 SHA1 650b82e4561d56ef65edbdd99f35c116a34fe866 SHA256 a971399e8aa0ec62df80fb36c2d1cde94348a0b27938e91c7282afd02a0a3507 EBUILD calculate-client-2.2.21.ebuild 857 RMD160 dd68f6706df67a990322ecadd8e4a7250e6b64f5 SHA1 125ed3e529c2bd59f6226fcae7e6a872cd403c4a SHA256 0da6b128cea3c217f2157f29009098812af4b32500b63cdfa244f2cba7a8dbf8 EBUILD calculate-client-2.2.22.ebuild 857 RMD160 8745d48140be3a67cf2d2b2e17a4ec0508f082ef SHA1 14c097dda3b784fbd25a7402bdc74307e69a7342 SHA256 bac704b80df34c2ecc05f4afb470e814c854e04ed65201fc1afdc9a5d5a46bba +EBUILD calculate-client-2.2.23-r1.ebuild 974 RMD160 bf182f82ef2c45982cbfd252e420d0e1900f6d8f SHA1 5a74662e64809de483dccb93bece3a3403b2834c SHA256 32fe77d6224948cca93e66c7031f8e2dd2d751f5a57a62f5abb8609fbc45487e EBUILD calculate-client-2.2.23.ebuild 857 RMD160 3a110d6faf226c5d663a2a088c8b320e255fc51b SHA1 5b78b1221ffeb66d35e39f6ce4177b8f83f1464e SHA256 3016796eaf8ad40125c3811334c2be013be0f2ddf4a2e59029554de89a32f692 EBUILD calculate-client-2.2.9999.ebuild 1623 RMD160 1b81a8a2088dba8bcb439a8c3ecdf1ebfe5656e6 SHA1 bfe1bc648163eab9a638d0be4974157a72ff237c SHA256 7680e14e7e79844248bbf9c45701543b219cd0c71d72cf4d7dcd6f3e571d8402 -MISC ChangeLog 19267 RMD160 9bd45e934d73588864b0470fc6f133aa4b09c506 SHA1 e4f7511180f89e3ee2a009b8d9eda9ba76968876 SHA256 90520ac069f333642d364abd262c61414ba40ee7a912b3b3ebcb93b4bf8ef1d7 +MISC ChangeLog 19477 RMD160 b6e9787a22ba19869a0f52a8dc5eb27069131c6c SHA1 140f0b19e5ef0b30031a7c0abe2637f0b9a75edf SHA256 af8bea6515fba90abd22f93388a9c07f24c062e9b9bea77cb256eead4f0d3070 MISC metadata.xml 310 RMD160 ed986dbc43c958bd57e0fb73749ee09167ee0221 SHA1 4007f716df1aa85ec65d926f246663effc382384 SHA256 5023605d36dcbb5d5fe1b1ac54f7125a4087479b5168601075a8050ed51c38c2 diff --git a/sys-apps/calculate-client/calculate-client-2.2.23-r1.ebuild b/sys-apps/calculate-client/calculate-client-2.2.23-r1.ebuild new file mode 100644 index 000000000..11b281dfc --- /dev/null +++ b/sys-apps/calculate-client/calculate-client-2.2.23-r1.ebuild @@ -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" +} diff --git a/sys-apps/calculate-client/files/calculate-client-2.2.23-r1.patch b/sys-apps/calculate-client/files/calculate-client-2.2.23-r1.patch new file mode 100644 index 000000000..514f33b11 --- /dev/null +++ b/sys-apps/calculate-client/files/calculate-client-2.2.23-r1.patch @@ -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")}] diff --git a/sys-apps/calculate-desktop/ChangeLog b/sys-apps/calculate-desktop/ChangeLog index ea38a26a1..aa3a9537a 100644 --- a/sys-apps/calculate-desktop/ChangeLog +++ b/sys-apps/calculate-desktop/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-desktop-2.2.23-r1 (06 Sep 2011) + + 06 Sep 2011; Mike Hiretsky (mhiretskiy) + +calculate-desktop-2.2.23-r1.ebuild, + +files/calculate-desktop-2.2.23-r1.patch: + Update for feature + *calculate-desktop-2.2.23 (05 Sep 2011) 05 Sep 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-desktop/Manifest b/sys-apps/calculate-desktop/Manifest index 90819643f..e55aea749 100644 --- a/sys-apps/calculate-desktop/Manifest +++ b/sys-apps/calculate-desktop/Manifest @@ -1,3 +1,4 @@ +AUX calculate-desktop-2.2.23-r1.patch 3071 RMD160 758f17129be7eb0d973e4b9d38a791ccc292d055 SHA1 0501341f716de3c3b5c24d5578bb02f9705b619e SHA256 27f7ab6d69a1f386b6a9568e212601d14e363a1f8296eef3e43ba5a312700e07 DIST calculate-desktop-2.2.18.tar.bz2 16323 RMD160 b4d1809826406787cbd8d846efec9044795acb0c SHA1 d445f9f7b0f0ef52e5a5d6064fb4841d122640b1 SHA256 1096bf06f5b24d1bdd12cd348b54739c251864803b0688c2d786099c13f45293 DIST calculate-desktop-2.2.19.tar.bz2 14418 RMD160 c7b193470679659cc492f5a08adfb7b334ede17c SHA1 453b2e7c651380ed1a9cb9ca7d44bc1a8c1fb3fd SHA256 3c84522bfbe0a82f0a8a16e7af8943c1098702780499b5cca899c1b4ac6dfb0f DIST calculate-desktop-2.2.20.tar.bz2 14400 RMD160 028f2bdc7cdeb7941dcf0c0b023a28dea89d52be SHA1 ec1060292fb5d142ed8cb947a63d64cfb2e12fb6 SHA256 e30c58e43ca80a45bb45817caf3ff3ff015157d579a22876a9256346b730995d @@ -9,7 +10,8 @@ EBUILD calculate-desktop-2.2.19.ebuild 875 RMD160 3749fae7718ba31c935c1bebcd8ac5 EBUILD calculate-desktop-2.2.20.ebuild 875 RMD160 1e93591bfcf553488bacf03e60215068cc1952d3 SHA1 d2601e566b53b495ef795ce42d5979b1f3edb11b SHA256 bae73e11f4cf8285072345fcd102d80bdac0eaa8c7871c5fa3c6b28923caf89b EBUILD calculate-desktop-2.2.21.ebuild 875 RMD160 9e3d031ce1518b65a782422635e1628f20a47dca SHA1 419eea4d14dc0410810feb6251d2ec6f56176c33 SHA256 b6cbf4868683fbe551633100a6804b0f6de9cf7a075d822accfa6eaaae8b34bd EBUILD calculate-desktop-2.2.22.ebuild 875 RMD160 d1108ef5b23ad47b2b077b536479d5b31f6775f9 SHA1 da9727835d980376ce9f0212b5b4de603501ffb3 SHA256 e8cbfbce534da37f82d3d48278edfbd8aaa8d479181a7729d08f6f2aeb2ea761 +EBUILD calculate-desktop-2.2.23-r1.ebuild 993 RMD160 dac0c902750d4a14fb7322737bf2dd71ecc400d2 SHA1 ca79155cc201a2519e220850b8b1bb8ad6a9b933 SHA256 3d2521724365379b9af23589cb427901203bc17d1bf2d09311955bbc3e7f6f38 EBUILD calculate-desktop-2.2.23.ebuild 875 RMD160 62ce3696958f1c3a68d3f92460c5308a3bdd6752 SHA1 8063bd4cf9df1d2d8b9f8516b2c052673434bfab SHA256 41c28ba79731cf2ac7313e6dfc30dcb1f820eb65b7354898ceb94bfade41fe16 EBUILD calculate-desktop-2.2.9999.ebuild 887 RMD160 1dc176568da935318117adcaa7747c2b2924eaab SHA1 c418e1a3b55d04b9f00939259e1231095285eeb1 SHA256 8824762b98472f9b6263c1d85b1f159aea6d7694dee7c93b336eae061afb77d3 -MISC ChangeLog 13952 RMD160 fb631eb5ce664514212c76c2be4bfa94ea9ad1e1 SHA1 1f5d6b765a82ded844966ca331a75e0795dde835 SHA256 e7c04d46b10652ecb25b4cf71e4d85bb838bb1a06ef8cf0160f0556ac86f3f42 +MISC ChangeLog 14161 RMD160 53d51667879de9a1c133691f62042727181c14c5 SHA1 7730cd76567ad8ba67ddde5dca821d1ecfba1491 SHA256 b44a85535e465aa7a8bc7b850c2c3ae23c8c5684d81dc39e479e7404ce23090a MISC metadata.xml 315 RMD160 36a1a8d03aed0a483def83e076f484a64d452a8b SHA1 f6e70641eab777d2417d8a7600e8d3f09f53f96f SHA256 67fea0b1af7d10c0f86e72ab40f527e99c6f81f7aace4716344bdfb97c769a18 diff --git a/sys-apps/calculate-desktop/calculate-desktop-2.2.23-r1.ebuild b/sys-apps/calculate-desktop/calculate-desktop-2.2.23-r1.ebuild new file mode 100644 index 000000000..ee3621eaa --- /dev/null +++ b/sys-apps/calculate-desktop/calculate-desktop-2.2.23-r1.ebuild @@ -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 +} diff --git a/sys-apps/calculate-desktop/files/calculate-desktop-2.2.23-r1.patch b/sys-apps/calculate-desktop/files/calculate-desktop-2.2.23-r1.patch new file mode 100644 index 000000000..14891424a --- /dev/null +++ b/sys-apps/calculate-desktop/files/calculate-desktop-2.2.23-r1.patch @@ -0,0 +1,74 @@ +diff --git pym/cl_desktop.py pym/cl_desktop.py +index e230d28..c2536d8 100644 +--- pym/cl_desktop.py ++++ pym/cl_desktop.py +@@ -105,6 +105,7 @@ class desktop(share): + """Методы работы с профилем пользователя""" + # Имя пользователя + userName = "" ++ verbose = False + + def installProg(self): + """Наложение шаблонов на систему при инсталяции""" +@@ -165,6 +166,17 @@ class desktop(share): + self.printERROR(_("Path %s exists") %userDir) + return False + ++ def displayTemplatesApplied(self,dirsFiles): ++ """ ++ Display templates are applied (--verbose) ++ """ ++ self.printWARNING(_("Following files were changed")+":") ++ for nameF in dirsFiles[1]: ++ nameFile = nameF ++ if nameFile[:1] != "/": ++ nameFile = "/" + nameFile ++ self.printWARNING(" "*5 + nameFile) ++ + def applyTemplatesFromUser(self, progress=False): + """Применяем шаблоны для пользователя""" + # Cоздаем объект обработки шаблонов +@@ -174,6 +186,8 @@ class desktop(share): + clTempl = template(self.clVars,cltObj=False) + # Объединяем шаблоны + dirsFiles = clTempl.applyTemplates() ++ if self.verbose: ++ self.displayTemplatesApplied(dirsFiles) + if progress: + clTempl.close() + if clTempl.getError(): +@@ -182,9 +196,10 @@ class desktop(share): + else: + return dirsFiles + +- def createHome(self, progress=False, live=False): ++ def createHome(self, progress=False, live=False, verbose=False): + """Создание профиля пользователя (пользовательской директории)""" + # Имя пользователя ++ self.verbose = verbose + uid = os.getuid() + try: + realUserName = pwd.getpwuid(uid).pw_name +diff --git pym/cl_desktop_cmd.py pym/cl_desktop_cmd.py +index e27d7f7..0dab534 100644 +--- pym/cl_desktop_cmd.py ++++ pym/cl_desktop_cmd.py +@@ -37,6 +37,8 @@ DESCRIPTION = _("Create home directory for the new user account") + # Опции командной строки + CMD_OPTIONS = [{'longOption':"live", + 'help':_("update only mutable parameters of user profile")}, ++ {'longOption':"verbose", ++ 'help':_("display the template is applied")}, + {'longOption':"set"}, + {'longOption':"install", + 'help':_("install package")}, +@@ -143,7 +145,8 @@ class desktop_cmd(share_cmd): + + def createHome(self, optObj): + """Создание домашней директории""" +- return self.logicObj.createHome(optObj.progress,optObj.live) ++ return self.logicObj.createHome(optObj.progress,optObj.live, ++ optObj.verbose) + + def install(self): + """Инсталяция программы""" diff --git a/sys-apps/calculate-i18n/ChangeLog b/sys-apps/calculate-i18n/ChangeLog index 776d24b27..373273449 100644 --- a/sys-apps/calculate-i18n/ChangeLog +++ b/sys-apps/calculate-i18n/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-i18n-2.2.23-r2 (06 Sep 2011) + + 06 Sep 2011; Mike Hiretsky (mhiretskiy) + +calculate-i18n-2.2.23-r2.ebuild, +files/calculate-i18n-2.2.23-r2.patch: + Update for desktop + *calculate-i18n-2.2.23-r1 (05 Sep 2011) 05 Sep 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-i18n/Manifest b/sys-apps/calculate-i18n/Manifest index 8c07db5cd..734bc485f 100644 --- a/sys-apps/calculate-i18n/Manifest +++ b/sys-apps/calculate-i18n/Manifest @@ -8,6 +8,7 @@ AUX calculate-i18n-2.2.20-r4.patch 126252 RMD160 c5fef72a39012010ac26aaa3bdcce1d AUX calculate-i18n-2.2.21-r1.patch 1143 RMD160 9ab755b1be226b0bac00431aad21d2351e3397f1 SHA1 a842bdd273348f170ec5237d5019550c894e90c3 SHA256 9b8789b9f8e399220771bf836b2580b810ebdad7614919393fc68a1f9a39776c AUX calculate-i18n-2.2.22-r1.patch 2685 RMD160 6784d7fc08ae28f2a3cc0b0402c50a5015f78fb5 SHA1 12d1648f34c19f512ec4d8d80d2603b5e092afa4 SHA256 e855b8899c8a901e02c0aa898a76ec1a4c72272a312527c09731385a990fe42c AUX calculate-i18n-2.2.23-r1.patch 903 RMD160 6e2a2e9e454770310ef998e0ded0454bef960a1f SHA1 04c9120f33e16d421d120b2a45cbf9ee98f38c2e SHA256 a9c58f5a4d82f553d638b6e18b2b0abfec7a3ba99b88cb43af255e0d505c1698 +AUX calculate-i18n-2.2.23-r2.patch 2216 RMD160 633545cef36f5f250c57a702fb2944193c9f0171 SHA1 623aa3288f9287f048145aaafe179b980d67bd18 SHA256 21aa29ef3a7945a006612c502e290f0df94dade4d10c04f6c263b0cbf261961b DIST calculate-i18n-2.2.19.tar.bz2 27303 RMD160 6b26957485cf49dc247b7bcd2ab50c899e769d55 SHA1 82814fe0368452415ada35bf0bbc07426052fc7f SHA256 d6b4e1c6a15590b9bf1b8db0257a17e971571478d61054d4ab0453f2729d436d DIST calculate-i18n-2.2.20.tar.bz2 27970 RMD160 915663f7501e22d4c38fd5f2b931a87ef38e085c SHA1 f50321956541713d899dc9a806e2504f7c9f20ec SHA256 06e8a53009793d434b721014bf06fc5483f87163215e2d1323e3dde5767d3ab4 DIST calculate-i18n-2.2.21.tar.bz2 28100 RMD160 8f785b28db85a946649ee87769d49ca77de9ec7d SHA1 262fad00e1f1127b75c9eaca4b8eef7787371e65 SHA256 bc9d9d1a03d50ed6d561265ee0161f2bea852a00af1685feaab8db247176f85b @@ -27,7 +28,8 @@ EBUILD calculate-i18n-2.2.21.ebuild 682 RMD160 7c158a21d27de99c219ced2043fddd4f6 EBUILD calculate-i18n-2.2.22-r1.ebuild 819 RMD160 1616d084f44483af4bfaccbba4780dcdade6eedc SHA1 9ea8ccb03f7b82eefe980c0c2486ff30f351101e SHA256 9bf055b707b487d6adc834eb80b59b05325a2a1fafd4c07f4425ab755ff78686 EBUILD calculate-i18n-2.2.22.ebuild 682 RMD160 7c158a21d27de99c219ced2043fddd4f6629a132 SHA1 0d112aab5e8857131b30969a9011fed2f26955b8 SHA256 d9b2a1b26c155475f01d3e42dd15f0222f786b21806fe2fbc7f5b91285394e09 EBUILD calculate-i18n-2.2.23-r1.ebuild 803 RMD160 5afe1cc858af899084c562aa1876f216d08d02b8 SHA1 6b666364fb5a836fee4828aa636c828625585ea3 SHA256 9e2703b7453850ac1e15d50879e047f3f4c1159f5aa23abf367cde02016aef2b +EBUILD calculate-i18n-2.2.23-r2.ebuild 802 RMD160 3fc605f3bf0ca36e3b0fe7fb530db1c4d5bd6207 SHA1 011756b85310e5817938366acaf8c0ba849ba005 SHA256 cc135564da5c94e53396cc7accdecc50a23c2ec34c75be0ae46a00679ad2308c EBUILD calculate-i18n-2.2.23.ebuild 682 RMD160 7c158a21d27de99c219ced2043fddd4f6629a132 SHA1 0d112aab5e8857131b30969a9011fed2f26955b8 SHA256 d9b2a1b26c155475f01d3e42dd15f0222f786b21806fe2fbc7f5b91285394e09 EBUILD calculate-i18n-2.2.9999.ebuild 680 RMD160 b3d1cfb1045bc3b5da1be318c13fd15919f16aef SHA1 acfe16d8ac67eb88426f46980df3892d7c5a7de7 SHA256 623a395dd35d2620e697b9f8c97d58d3a7220cade8b3a69186050d921d26b802 -MISC ChangeLog 3057 RMD160 200596550340f35536b4d59dd7d8a71116463e4b SHA1 cadd27598fd56738f43c7b442248f1f16de12330 SHA256 4eefcf8c3ca91faf67109a415135d604699da04925866a6549a5538dadbc3a22 +MISC ChangeLog 3255 RMD160 614abd9620acc77b669720b1a68967427e039908 SHA1 53b188998ced79047bedd7e77cbc59580492d895 SHA256 75c48599c2016d7eea564fbc0d6b482d68adbfbed7c8b82aeebfb6a20cdbe6c4 MISC metadata.xml 276 RMD160 d9730825fc3ad1b5ea7ba45704121ebd29e38b11 SHA1 c4c1576efbc38119efca43cfa273cb9f433f1de1 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c diff --git a/sys-apps/calculate-i18n/calculate-i18n-2.2.23-r2.ebuild b/sys-apps/calculate-i18n/calculate-i18n-2.2.23-r2.ebuild new file mode 100644 index 000000000..b59d61c2d --- /dev/null +++ b/sys-apps/calculate-i18n/calculate-i18n-2.2.23-r2.ebuild @@ -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 + ! + +calculate-templates-2.2.23-r2.ebuild, + +files/calculate-templates-2.2.23-r2.patch: + Update for bugfix + *calculate-templates-2.2.23-r1 (05 Sep 2011) 05 Sep 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest index 4244fc282..cdfffbbea 100644 --- a/sys-apps/calculate-templates/Manifest +++ b/sys-apps/calculate-templates/Manifest @@ -12,6 +12,7 @@ AUX calculate-templates-2.2.21-r4.patch 72564 RMD160 449d036af597d63958f0c6aa6eb AUX calculate-templates-2.2.22-r1.patch 1001 RMD160 84681dfcf97292c962995e8171b5c9197705b79e SHA1 172032720b6e553eef4e6cb0fce4fbe08bc8c06f SHA256 66335e3897612662edb5e6301a10964466c7ca9e9c1b55505258fb0d70f63a4f AUX calculate-templates-2.2.22-r2.patch 26325 RMD160 16cedf1b883e122382681d5968d867f749b911c9 SHA1 184bccd9da9d0b6ff59106eeb40d01c5e5bf0468 SHA256 01c91d55b87170a1febdb6a147896424d1c4afac932ef302ec5e762e648a425e AUX calculate-templates-2.2.23-r1.patch 355 RMD160 542c930c91be186dbea77edaf0c889d244c0d62e SHA1 008741a06ecdf0a079b704e81e2fd2ce8fff7e4b SHA256 2b972fc7f4e02a1ea48eab0c61591516a9592d9d2eeb90361632f297b338431f +AUX calculate-templates-2.2.23-r2.patch 1968 RMD160 e0265a6da151e64a91c9c3c0f4003637b818b52f SHA1 9ef7c9899109c46c0987017e61ea844bc3819873 SHA256 3c07f4c5534cf03b48a21be39b1d4a6b00fe731e7e2b8eb8b8e8255da4bd287a DIST calculate-templates-2.2.18.tar.bz2 233661 RMD160 c8e42c3ed8860193286ff8eaeddcd1c75bb1ef0b SHA1 f197621e5777c16aca9b892d30ede172eee50522 SHA256 d3d236c7e0760db3ad9ea79f0fed9d9e5f97d69acabbae3bbc9c9d2e62a50984 DIST calculate-templates-2.2.19.tar.bz2 233495 RMD160 bd6ec2efa456b838c15664e7779d01cd760cb124 SHA1 c0f79506fb676a8c37efbdff4a0514a3a8ddb29e SHA256 f5124a64393a3c6d4a03bd3c0065cc7f5a3586f6d5de5362d1b373048b2303ab DIST calculate-templates-2.2.20.tar.bz2 234266 RMD160 7368253076289f8e255ae325e629ffe73da060ec SHA1 b39b75801f8361a36eb6e8ce92da63dfef5230ca SHA256 b907b4630aca4942af66ffe24144959723879d25f4ce72e344639f86223b828a @@ -38,7 +39,8 @@ EBUILD calculate-templates-2.2.22-r1.ebuild 710 RMD160 1b8456425ae6afecbedaee2b1 EBUILD calculate-templates-2.2.22-r2.ebuild 740 RMD160 9fda92b6fff58b820767a7db328b9252298c06d0 SHA1 d215980e2298bc324f18f672778e19cd6ec8b8f4 SHA256 baeec39764d38a91a6e081ce7574aedbd3530878f80c052d718bbf3004829f36 EBUILD calculate-templates-2.2.22.ebuild 581 RMD160 1cba8f7d4582bf790b2da63e98e1e0efe564c0bd SHA1 10d710aadae8bb9e8df406339d348428a835d098 SHA256 2aeed6089507412176e069d5190717bd618830cdd2c740ae39a50a0f6b283d4e EBUILD calculate-templates-2.2.23-r1.ebuild 708 RMD160 a79fc5bd6ed64800c56e983dd9da45e09bc8e797 SHA1 3b320ce2e5c8e0b17e1c452defa86bb10f2a7dec SHA256 2072d300dcc1e534e07246812ca51824214b21f28e5d39e1fac68c28c1b3bb50 +EBUILD calculate-templates-2.2.23-r2.ebuild 711 RMD160 a5475e0624b9d7cf20186dc29a4d00886bfa160c SHA1 5896c88f5b4cfae8c8009b39e35c32294b7f170e SHA256 dc4f242a517bdc73b8ca8fae2393c846dec80301efb7a5263608a0c71d5d0706 EBUILD calculate-templates-2.2.23.ebuild 583 RMD160 a7354d64c92e7e7668f3d14de0ad6e8b29842795 SHA1 d70032a967d562caa0c41282bc28207fdf106f09 SHA256 6fc8a45fdd8bd8c4c1f597037c6122f1493f78d839bf4ed74c0152fc4bcc8b2d EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 14e53f7c05efbb563b793b1025669cbe79d0838c SHA1 226d287ce0a00609ed6c871321abf5000565227e SHA256 5df16332077472571e2d4aae47e958d1e6efe3a8d694b61053778f75a537142f -MISC ChangeLog 29786 RMD160 eb98e6a07061f61b34409ea483b9199b3c1e93a9 SHA1 862062289a5dc9601020993ac33c0141438eddcc SHA256 cf8b0866c4cbc3b3e4395df2d631f4cfd5409fa47138fd81f2a5c26f89f5828b +MISC ChangeLog 30000 RMD160 667bd9ddba1620969c3d48696539ac86c7feeb8a SHA1 4a0d2ab93741863de8b2f1f51f9611e7b6cc7442 SHA256 3ba3080eeaa5aca3fb9ddae63872a8533d6d683b11258ba20fb7fa36e4a24dc9 MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.23-r2.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.23-r2.ebuild new file mode 100644 index 000000000..69e58aea0 --- /dev/null +++ b/sys-apps/calculate-templates/calculate-templates-2.2.23-r2.ebuild @@ -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 * +} diff --git a/sys-apps/calculate-templates/files/calculate-templates-2.2.23-r2.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.23-r2.patch new file mode 100644 index 000000000..7f6f78132 --- /dev/null +++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.23-r2.patch @@ -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 ++LANG=C /usr/bin/cl-install --startup --live ++LANG=C /usr/bin/cl-install --startup +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 diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index 4f2cf70bd..f5d6695a7 100644 --- a/sys-apps/calculate-utilities/ChangeLog +++ b/sys-apps/calculate-utilities/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-utilities-2.2.23-r3 (06 Sep 2011) + + 06 Sep 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.23-r3.ebuild: + Update for desktop,client,i18n,templates + *calculate-utilities-2.2.23-r2 (05 Sep 2011) 05 Sep 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index f395b71f1..ecc59f9ba 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -43,6 +43,7 @@ EBUILD calculate-utilities-2.2.22-r4.ebuild 879 RMD160 337c9a6748fdde68cd7389416 EBUILD calculate-utilities-2.2.22.ebuild 862 RMD160 e8bb89257a8475f8822893d62cb929753a9bdb20 SHA1 e2a5cd9b07aa215dea3d55cf4a3d7d1c81568403 SHA256 42e6179382cc058bf93136aa8df7b8ea98ec6164980626745b508182926f85f6 EBUILD calculate-utilities-2.2.23-r1.ebuild 870 RMD160 8d6a1be9a872bfa48edd8931f385c71092354a16 SHA1 5886e6e3e73583e78f82d720c5a1f6c6d2b62844 SHA256 fe3bb513b362eaee70d3a0941742906020f40423971453ee65a2d4b4e4eaa865 EBUILD calculate-utilities-2.2.23-r2.ebuild 870 RMD160 9dba2c47d21f10441e159edb69d46271ec9cb583 SHA1 aeff85bb0e88079d11038c99e3fc48b7ad9e7341 SHA256 b147919d3dd48a2bd6dc003659ccb33eade4fa4e27d9d2f3d5dd6ab8be87cb80 +EBUILD calculate-utilities-2.2.23-r3.ebuild 876 RMD160 3bdc5646d8409dd241e0311bef7d082f1daf421c SHA1 085fb664e1699320b65edbc99e3f83129ea64197 SHA256 4082b7e280e4b68c9f894aa78e0213111677180a27091d60136aa888adc26656 EBUILD calculate-utilities-2.2.23.ebuild 861 RMD160 a625469de75e5f99cc6d7b39496787b4a0c405f6 SHA1 bcbd37e0e4b92a070f68b8aac7a0c3f2c62a9b21 SHA256 4b5b2b88c9a225f33e7b3175bd02e38ccc03c5ae3be54894e92162b9b34ba106 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 22367 RMD160 e00ee25c5aed5ffaecd8f2d01b1b80d4b97cf9eb SHA1 982c9aee823e37f39f2aee6bf97729a666ae73d3 SHA256 bed55aa56fc8288a547fcd5449c6cb88ba6e3b15c1ed8d8ad069faaa9ff52930 +MISC ChangeLog 22558 RMD160 4d9ac916c4bd61dbef2be1eb9d169c1d8e973f66 SHA1 571150a5e438a8d6ed96569154811a05c5349fd1 SHA256 ea0afcd944fc2ddf62c7b6639d0346a438a56e27d85f4d144bdd09ff9eb181e6 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.23-r3.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.23-r3.ebuild new file mode 100644 index 000000000..850d785ac --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.23-r3.ebuild @@ -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 ) +"