From e25c5ee9f84d6961a4e2c28ebda3913948ea0ef1 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 17 May 2011 10:28:54 +0400 Subject: [PATCH] Fix calculate-server fifo processing. --- sys-apps/calculate-lib/ChangeLog | 6 + sys-apps/calculate-lib/Manifest | 4 +- .../calculate-lib-2.1.8-r2.ebuild | 32 ++++ .../files/calculate-lib-2.1.8-fix_fifo.patch | 27 +++ sys-apps/calculate-server/ChangeLog | 7 + sys-apps/calculate-server/Manifest | 4 +- .../calculate-server-2.1.13-r2.ebuild | 172 ++++++++++++++++++ .../calculate-server-2.1.13-fifo_fix.patch | 30 +++ sys-apps/calculate-utilities/ChangeLog | 6 + sys-apps/calculate-utilities/Manifest | 3 +- .../calculate-utilities-2.2.14-r10.ebuild | 35 ++++ 11 files changed, 323 insertions(+), 3 deletions(-) create mode 100644 sys-apps/calculate-lib/calculate-lib-2.1.8-r2.ebuild create mode 100644 sys-apps/calculate-lib/files/calculate-lib-2.1.8-fix_fifo.patch create mode 100644 sys-apps/calculate-server/calculate-server-2.1.13-r2.ebuild create mode 100644 sys-apps/calculate-server/files/calculate-server-2.1.13-fifo_fix.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.14-r10.ebuild diff --git a/sys-apps/calculate-lib/ChangeLog b/sys-apps/calculate-lib/ChangeLog index d3eeb1e7f..f6be5c761 100644 --- a/sys-apps/calculate-lib/ChangeLog +++ b/sys-apps/calculate-lib/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-lib-2.1.8-r2 (17 May 2011) + + 17 May 2011; Mike Hiretsky (mhiretskiy) + +calculate-lib-2.1.8-r2.ebuild, +files/calculate-lib-2.1.8-fix_fifo.patch: + Fix fifo processing. + *calculate-lib-2.2.14-r2 (13 May 2011) 13 May 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest index 70e62270d..b48d18f14 100644 --- a/sys-apps/calculate-lib/Manifest +++ b/sys-apps/calculate-lib/Manifest @@ -1,3 +1,4 @@ +AUX calculate-lib-2.1.8-fix_fifo.patch 1049 RMD160 efc57f006e2d1c73b645f881a6d0ae631c92bdfd SHA1 24122c47ef1a411d731229535e2fda27b0ec8dd0 SHA256 dd4589a0b7085431ffc9c2972890b11c5d0445db5129b8e4fac17d371057c9e2 AUX calculate-lib-2.2.14-backport.patch 3577 RMD160 89315ee122c012411a11c02c1546f266c12d2c55 SHA1 0df662895aecbd7bce7ce104c8cec19fe49d9cdd SHA256 f7c5994e6b0cb2bc4913d2287570c2172eb3f901c27d521b14ccf3d6130ac4c0 AUX calculate-lib-2.2.14-fix_root_type_detect.patch 6398 RMD160 acc25d01099f4bc00cff4e8aaf118da883501913 SHA1 966dc33d3991756d14b5e48e45f2b72475f526b5 SHA256 3b23da15ce78a479c1558ddd1912f0340ef714b6147843329b44b9933d0c078d AUX calculate-lib-2.2.8-file.patch 747 RMD160 8a1f90c822eaefac69b67aa6999a1dc8c2b51b9f SHA1 aeded1b0587785145f4e62f3e81a2726e7c4312d SHA256 45ce03a248d8bec22bbdf006ce607809761304d255467e687242f9423c8413a4 @@ -6,11 +7,12 @@ DIST calculate-lib-2.1.8.tar.bz2 61178 RMD160 4a4ed063a9b4d3b82723f5f6eb046c97ad DIST calculate-lib-2.2.13.tar.bz2 108385 RMD160 d604e68f58c845c7735b751e7ed4604bd17926f6 SHA1 b4130b09f041c91fd97a0ed56c769052ee158f4c SHA256 204f5dc8abcdd4528c9a3041a551c4080ecf30507115b215282880d059c93d49 DIST calculate-lib-2.2.14.tar.bz2 108601 RMD160 e45e12b5eac886f31e6fd75d3ebe8538f51674a1 SHA1 ae25dc59a91b827a35dbf0f492ea4f5bbae5ab3c SHA256 e6e375d746bb67dc80de37060633cc67194b489855a572bfe0b0d95dbd5df098 EBUILD calculate-lib-2.1.8-r1.ebuild 730 RMD160 a207fbb024eaedeff679eb052b6ca04f289f914f SHA1 68c72562dc796958dd83dc4c59b2444678180b52 SHA256 b6a343b0f4d9e557ca42f5505c56c2373c04d1fa98191cf03b15cd0cdd0bb603 +EBUILD calculate-lib-2.1.8-r2.ebuild 810 RMD160 ff412a1e0f7ea1ec3493738e23e3e7ec9334d49d SHA1 251a1fa961d07ef51c1c29ff930f73839b838bc8 SHA256 9cb04ff79362d497c9ac6a52353933683201337cb50104ab7a0b70ba6fdb04c1 EBUILD calculate-lib-2.2.13.ebuild 620 RMD160 c6b655288e00b8225c87a7c0aee27df1602978bf SHA1 8effba1ef6dec2caf6c75162ced40d8d9c571702 SHA256 733ddccc79c4df5fac82a50a8c94b1494033ed7fb89f4df6ec95d5e8e10ab1d7 EBUILD calculate-lib-2.2.14-r1.ebuild 737 RMD160 2d18284f46a7a1960fc526ee38afe2f2a761e04c SHA1 8de7ec1b07543bf6046ccea0c40bcb794aa23e9a SHA256 d0fb8cff5aefd3f15b5c6a1ee4bc4a311c977d01e11a28f8426153edd44b63a9 EBUILD calculate-lib-2.2.14-r2.ebuild 832 RMD160 08bbdb3221fc9202d0de4b770993804a90a4069a SHA1 52309b3871a7d3e02b0ef03f522a990d6f704d56 SHA256 336c4324092b6e335cbf8c87e803b21ba1d80d21c1da5e38f9e126daa63c95a2 EBUILD calculate-lib-2.2.14.ebuild 620 RMD160 c6b655288e00b8225c87a7c0aee27df1602978bf SHA1 8effba1ef6dec2caf6c75162ced40d8d9c571702 SHA256 733ddccc79c4df5fac82a50a8c94b1494033ed7fb89f4df6ec95d5e8e10ab1d7 EBUILD calculate-lib-2.2.9999.ebuild 726 RMD160 6dce718f317825c712f7c9595a3e712ef6222cf9 SHA1 42e1607a36e826310ef5ed317d717c5aa8acc2bf SHA256 dce73aafa346ea1fd88b6e99d8f6184a562de56e3eb871c1b5849890b13c34c2 EBUILD calculate-lib-9999.ebuild 476 RMD160 3df165f011b324fa8dc37d0443e941263943dd61 SHA1 069ab864dc83f32c69c4349d807d25e1196756ee SHA256 07a628ede4f47849908dd543f879ab8b40a5ca887b892fa0f5cf6c1ef2a24cab -MISC ChangeLog 19669 RMD160 95eaef9f727cf4fddebf79ecd29ddb2dbb8f9006 SHA1 35f4c71bcd57f02638964c1c3e415a8598ba4022 SHA256 64c870d9530243e13c17f62525a81245a8365e24f8ff32b5123608fdb9e45dbe +MISC ChangeLog 19869 RMD160 ef669dbaa9409987c23af660d1750e04458ae9fb SHA1 45e3b7bceb24e15c8027948c90a20c69a337a72b SHA256 ecdf7f57ad745ff83d8d9f49f7febd17b01523b6ca907db2529f6bb08d234297 MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec diff --git a/sys-apps/calculate-lib/calculate-lib-2.1.8-r2.ebuild b/sys-apps/calculate-lib/calculate-lib-2.1.8-r2.ebuild new file mode 100644 index 000000000..24ea42bf0 --- /dev/null +++ b/sys-apps/calculate-lib/calculate-lib-2.1.8-r2.ebuild @@ -0,0 +1,32 @@ +# 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 library for Calculate 2" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" +DEPEND="!=dev-lang/python-2.5.2 + >=dev-python/python-ldap-2.0[ssl] + >=dev-python/pyxml-0.8" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # change palce of i18n files to /usr/share/calculate-2.0 + epatch "${FILESDIR}/lib_i18n_path.patch" + # fix fifo processing + epatch "${FILESDIR}/calculate-lib-2.1.8-fix_fifo.patch" +} diff --git a/sys-apps/calculate-lib/files/calculate-lib-2.1.8-fix_fifo.patch b/sys-apps/calculate-lib/files/calculate-lib-2.1.8-fix_fifo.patch new file mode 100644 index 000000000..94b4813e8 --- /dev/null +++ b/sys-apps/calculate-lib/files/calculate-lib-2.1.8-fix_fifo.patch @@ -0,0 +1,27 @@ +commit 267519aa6b09b24cb45e965bbbdb8448eb8dde6b +Author: Mike Hiretsky +Date: Tue May 17 09:57:50 2011 +0400 + + Add fifo to scan files. + +diff --git a/pym/cl_profile.py b/pym/cl_profile.py +index cad373a..618ef27 100644 +--- a/pym/cl_profile.py ++++ b/pym/cl_profile.py +@@ -1940,6 +1940,7 @@ class _file(_error): + self.files = [] + self.links = [] + self.sockets = [] ++ self.fifo = [] + def getFilesDir(dirP, dirname,names): + for nameFile in names: + absNameFile = dirname + "/" + nameFile +@@ -1953,6 +1954,8 @@ class _file(_error): + dirP.dirs.append(absNameFile) + elif stat.S_ISSOCK(os.stat(absNameFile)[stat.ST_MODE]): + dirP.sockets.append(absNameFile) ++ elif stat.S_ISFIFO(os.stat(absNameFile)[stat.ST_MODE]): ++ dirP.fifo.append(absNameFile) + for profileDir in profilesDirs: + if profileDir: + dirP = dirProf() diff --git a/sys-apps/calculate-server/ChangeLog b/sys-apps/calculate-server/ChangeLog index d623b3930..a803aac38 100644 --- a/sys-apps/calculate-server/ChangeLog +++ b/sys-apps/calculate-server/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-server-2.1.13-r2 (17 May 2011) + + 17 May 2011; Mike Hiretsky (mhiretskiy) + +calculate-server-2.1.13-r2.ebuild, + +files/calculate-server-2.1.13-fifo_fix.patch: + Update server for fix fifo processing. + 13 Apr 2011; Mike Hiretsky (mhiretskiy) calculate-server-2.1.13.ebuild, calculate-server-2.1.13-r1.ebuild, calculate-server-9999.ebuild: diff --git a/sys-apps/calculate-server/Manifest b/sys-apps/calculate-server/Manifest index ee9d5f183..d37ce46e5 100644 --- a/sys-apps/calculate-server/Manifest +++ b/sys-apps/calculate-server/Manifest @@ -1,7 +1,9 @@ +AUX calculate-server-2.1.13-fifo_fix.patch 1122 RMD160 e015ecfd39ff9dd62fbee98ae9465dfa9cd87fff SHA1 e74caba4e28ba4aeebd556d9866eca7226950762 SHA256 a065091c6dfbfeef8e9d8c0c229a015c571ff1d7d96781397a0176b2cb6bd262 AUX calculate-server-2.1.13-rename_cl_update.patch 4885 RMD160 0eb4083d8a6e381fbc88044d9f6b8eba8b837bf5 SHA1 10ad7a4967f58049a71b1e2e7fa2e1289a5c8072 SHA256 87d7435e5a987f18644022bef20f7c4deafd1fd162a3a3656999aff74eebaa59 DIST calculate-server-2.1.13.tar.bz2 157717 RMD160 42d15a964a8c94774003d89ddc6bd834d20b1d5d SHA1 08e47e64aa8173b76a73693346d465ed62ac2ea1 SHA256 c748759f792c21dd28f2659bfeccf2a707c08f36a5d49766ceb6b922a98e930e EBUILD calculate-server-2.1.13-r1.ebuild 5100 RMD160 1a8e0de5d7a283a4bdddc644e4cb72d8c9a2f5a8 SHA1 4b4002c079fe429e94fc9fe750847a588b1ece94 SHA256 cdce4a2c954bfcdc6deb32c2af1a5a56083aedf7a382f7645ac1fd83043a82d6 +EBUILD calculate-server-2.1.13-r2.ebuild 5184 RMD160 c25bba74a1d999c47066a04092f96b7a993aeba4 SHA1 6cebce6f3342b7a9b4d173a22f25e91acb9aecd9 SHA256 764e2f219aaa1db76c0c64376287529e3a69b3d87041df5aa3add663c01de4ce EBUILD calculate-server-2.1.13.ebuild 4947 RMD160 f84f1384fcd7705a718b5c88b6066e262987ac3b SHA1 596a88a3e393f689a0d76ddb3dc723d03b3eb816 SHA256 feee22c11dd0617ea25164445bd1f074d06a3e30a2b57704d325f71ae6e4bb66 EBUILD calculate-server-9999.ebuild 982 RMD160 0f4120756b5a9b533783c3ba95380507b6f9cd1b SHA1 f77edc90b28cfe8b2d12fd8830fe1641e5119bd7 SHA256 0486a61066cee349510bef0f68e8ffa37ce5ea5a2be0859fbec7eacadcb91913 -MISC ChangeLog 5639 RMD160 2512466b77cf44ae2363a2983a258b78161fd70d SHA1 959c9ef159f0de50c27d133331017512c1aeb72e SHA256 c64f7d5e3e17647056f8eabfd471bc16695060fab03dc69f329545e506d92bb6 +MISC ChangeLog 5871 RMD160 0d9d2ef1f4cfa99516805ff2f4ac482316225fb2 SHA1 5e7530c5481ae7117f175f0d3ccac7fa40ebb83d SHA256 8571b7f703ee2548b39f8d38195c47183c3344bc843f857905402f4f3bdf2ae6 MISC metadata.xml 286 RMD160 e243725ec1a1302cab0d0efee76a4a926e855916 SHA1 6071aa604ea5a1ba8e1772e8f37a24f26b893d8d SHA256 aab7ddde310df96da76277d5ae340a4b0926bec3b354bfb2fea3288081036d74 diff --git a/sys-apps/calculate-server/calculate-server-2.1.13-r2.ebuild b/sys-apps/calculate-server/calculate-server-2.1.13-r2.ebuild new file mode 100644 index 000000000..e8f482d07 --- /dev/null +++ b/sys-apps/calculate-server/calculate-server-2.1.13-r2.ebuild @@ -0,0 +1,172 @@ +# 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 for configuring services Linux" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="" + +DEPEND="=sys-apps/calculate-lib-2.1.8-r2 + >=net-nds/openldap-2.3[-minimal] + >=sys-auth/pam_ldap-180[ssl] + >=sys-auth/nss_ldap-239 + >=net-fs/samba-3.4.6[acl,client,cups,ldap,netapi,pam,server,smbclient] + =net-mail/dovecot-1.2.0[ldap,pam,ssl] + ) + >=mail-mta/postfix-2.2[ldap,pam,ssl] + || ( =net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,radius,ssl,tcpd] + ) + >=mail-filter/procmail-3.22 + >=net-dns/bind-9.6.1_p1[sdb-ldap] + >=net-proxy/squid-3.0.14[ldap,pam,ssl] + >=net-misc/dhcp-3.1.2_p1 + >=media-gfx/imagemagick-6.6" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # change cl-update to cl-update-server + epatch "${FILESDIR}/calculate-server-2.1.13-rename_cl_update.patch" + # fix fifo processing + epatch "${FILESDIR}/calculate-server-2.1.13-fifo_fix.patch" +} + +pkg_postinst() { + if [ -d /var/calculate/server-data/mail/imap ] || \ + [ -d /var/calculate/server-data/samba/win/profiles ] || \ + [ -d /var/calculate/server-data/samba/unix/profiles ] || \ + [ -d /var/calculate/server-data/samba/win/netlogon ]; + then + ewarn "Data found in directories of previous version calculate-server" + fi + + if [ -d /var/calculate/server-data/mail/imap ]; + then + if ! [ -d /var/calculate/server-data/mail~ ]; + then + if mv /var/calculate/server-data/mail/imap \ + /var/calculate/server-data/mail~ && \ + rmdir /var/calculate/server-data/mail && \ + mv /var/calculate/server-data/mail~ \ + /var/calculate/server-data/mail; + then + ewarn + ewarn "Data from /var/calculate/server-data/mail/imap" + ewarn "was moved to /var/calculate/server-data/mail" + MAILUPDATE="TRUE" + fi + fi + if ! [ "${MAILUPDATE}" == "TRUE" ]; + then + eerror "Cannot move /var/calculate/server-data/mail/imap" + eerror "Please manualy move /var/calculate/server-data/mail/imap" + eerror "to /var/calculate/server-data/mail" + fi + fi + + if [ -d /var/calculate/server-data/samba/win/profiles ]; + then + SAMBAUPDATE="" + if ! [ -d /var/calculate/server-data/samba/profiles/win ]; + then + if mkdir -p /var/calculate/server-data/samba/profiles && \ + mv /var/calculate/server-data/samba/win/profiles \ + /var/calculate/server-data/samba/profiles/win; + then + ewarn + ewarn "Data from /var/calculate/server-data/samba/win/profiles" + ewarn "was moved to /var/calculate/server-data/samba/profiles/win" + SAMBAUPDATE="TRUE" + fi + fi + if ! [ "${SAMBAUPDATE}" == "TRUE" ]; + then + eerror "Cannot move /var/calculate/server-data/samba/win/profiles" + eerror "Please manualy move " + eerror "/var/calculate/server-data/samba/win/profiles" + eerror "to /var/calculate/server-data/samba/profiles/win" + fi + fi + + if [ -d /var/calculate/server-data/samba/unix/profiles ]; \ + then + SAMBAUPDATE="" + if ! [ -d /var/calculate/server-data/samba/profiles/unix ]; + then + if mkdir -p /var/calculate/server-data/samba/profiles && \ + mv -f /var/calculate/server-data/samba/unix/profiles \ + /var/calculate/server-data/samba/profiles/unix; + then + rmdir /var/calculate/server-data/samba/unix + ewarn + ewarn "Data from /var/calculate/server-data/samba/unix/profiles" + ewarn "was moved to /var/calculate/server-data/samba/profiles/unix" + SAMBAUPDATE="TRUE" + fi + fi + if ! [ "${SAMBAUPDATE}" == "TRUE" ]; + then + eerror "Cannot move /var/calculate/server-data/samba/unix/profiles" + eerror "Please manualy move " + eerror "/var/calculate/server-data/samba/unix/profiles" + eerror "to /var/calculate/server-data/samba/profiles/unix" + fi + fi + + if [ -d /var/calculate/server-data/samba/win/netlogon ]; + then + SAMBAUPDATE="" + if ! [ -d /var/calculate/server-data/samba/netlogon ]; + then + if mv -f /var/calculate/server-data/samba/win/netlogon \ + /var/calculate/server-data/samba/netlogon; + then + rmdir /var/calculate/server-data/samba/win + ewarn + ewarn "Data form /var/calculate/server-data/samba/win/netlogon" + ewarn "was moved to /var/calculate/server-data/samba/netlogon" + SAMBAUPDATE="TRUE" + fi + fi + if ! [ "${SAMBAUPDATE}" == "TRUE" ]; + then + eerror "Cannot move /var/calculate/server-data/samba/win/netlogon" + eerror "Please manualy move " + eerror "/var/calculate/server-data/samba/win/netlogon" + eerror "/var/calculate/server-data/samba/netlogon" + fi + fi + + if [ "${MAILUPDATE}" == "TRUE" ]; + then + ewarn + ewarn "Please update mail service by the command:" + ewarn "\tcl-update mail" + fi + if [ "${SAMBAUPDATE}" == "TRUE" ]; + then + ewarn + ewarn "Please update samba service by the command:" + ewarn "\tcl-update samba" + fi + + ewarn + ewarn "WARNING!!! If you have the samba service, then update it by the command:" + ewarn "\tcl-update samba" +} diff --git a/sys-apps/calculate-server/files/calculate-server-2.1.13-fifo_fix.patch b/sys-apps/calculate-server/files/calculate-server-2.1.13-fifo_fix.patch new file mode 100644 index 000000000..82d1dd339 --- /dev/null +++ b/sys-apps/calculate-server/files/calculate-server-2.1.13-fifo_fix.patch @@ -0,0 +1,30 @@ +commit a75af744f9cd2e45404fad74ac560fabe1f1cc79 +Author: Mike Hiretsky +Date: Tue May 17 10:05:20 2011 +0400 + + Add processing fifo files. + +diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py +index 6806945..c66326b 100644 +--- a/pym/cl_ldap.py ++++ b/pym/cl_ldap.py +@@ -1176,6 +1176,9 @@ in a sambaDomainName', + for socketRm in scanObjs[0].sockets: + # Удаляем сокеты + os.remove(socketRm) ++ for fifoRm in scanObjs[0].fifo: ++ # Удаляем fifo ++ os.remove(fifoRm) + for linkRm in scanObjs[0].links: + # Удаляем ссылки + os.unlink(linkRm[1]) +@@ -1421,6 +1424,9 @@ if you want to continue to run the program again")) + # Удаляем сокеты + for rmSocket in scanObjs[0].sockets: + os.remove(rmSocket) ++ # Удаляем fifo ++ for rmFifo in scanObjs[0].fifo: ++ os.remove(rmFifo) + mode,uid,gid = fileObj.getModeFile(srcDir) + os.chmod(destDir, mode) + os.chown(destDir, uid,gid) diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index 3c2b84090..0d0848941 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.14-r10 (17 May 2011) + + 17 May 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.14-r10.ebuild: + Update for calculate-server. + *calculate-utilities-2.2.14-r9 (13 May 2011) 13 May 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 2bad8be50..dd9d07d70 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -1,6 +1,7 @@ EBUILD calculate-utilities-2.2.13-r1.ebuild 829 RMD160 356e34c0e993680aa7b97083f22bae183a1994a7 SHA1 3ef2c673fe2de8d82e075372e86920cc6ed7b68d SHA256 d000ff376be9885beea78bef04ad3908163761c34afa01f01dac4815f43d9356 EBUILD calculate-utilities-2.2.13.ebuild 826 RMD160 19ffb89c43a416fc2f4b8a1f27ef7aba2cba7a1e SHA1 62a5ee415821bf5dc7a99f43c736ad210c74da31 SHA256 be6a76a4143b90786d584608c72e59e85bb188826b783685a9973cadaa9dbffd EBUILD calculate-utilities-2.2.14-r1.ebuild 832 RMD160 7910f7e37d022f057c2f22f472829aaa8ef348db SHA1 b22185f43b0176b2c1390415f9820cfc443eddfa SHA256 4ae0bbb1aa1f6f530c32eafe4c98331391552880f02a5f9540878e6fc49a65fa +EBUILD calculate-utilities-2.2.14-r10.ebuild 843 RMD160 ff806e810e4e2dc6575c8926f1a623d9c94f9aac SHA1 14c7060ada48652a978fb7fc06b03593c9cad7ad SHA256 6af19982434211315af40c8d02d54ca8557c1c329223d9040e563f65581b057c EBUILD calculate-utilities-2.2.14-r2.ebuild 835 RMD160 f8dd73de1e46cc3eb656af5cb5776b18a4442300 SHA1 a7e1a644177f98b79002e738c20250b205b8407a SHA256 c730d81d769c2159ba8f3d9bb5a1b4592eb16ad8fbaf6f13eb3ea3ee25acfd40 EBUILD calculate-utilities-2.2.14-r3.ebuild 840 RMD160 30b86a7b261ea59de54b77da4951b94618ed571f SHA1 db570fbfedfce8330d287ba2ddbbaa01cb4d5648 SHA256 7281825f281e6b04478a6e6d49542b38e649d521ccc5a76521dd679f9ac5b4a1 EBUILD calculate-utilities-2.2.14-r4.ebuild 840 RMD160 2485ad3ef4ac93a6787851fcdf50160de8e0849f SHA1 ddd8725be55d2363d827ddba01d323b6d9930535 SHA256 3fbe0a1f0c729608a0f6eb3cda2af7304b4513fa829c04eeef23393bd7b2c4e1 @@ -11,4 +12,4 @@ EBUILD calculate-utilities-2.2.14-r8.ebuild 843 RMD160 10e072d6179f4bb6cf59a7e53 EBUILD calculate-utilities-2.2.14-r9.ebuild 843 RMD160 93f568a0c485d5650fa6fa1574f170353516100c SHA1 5a9bda01e59d99fb1a4a21969c64fecc2a429dd4 SHA256 33678f9e86dfd1a2873d74f262edd27c5601169a1d1b4fc8a2cc2e0e45f2b5f4 EBUILD calculate-utilities-2.2.14.ebuild 829 RMD160 ca16f926dbac23f8a83595b70723e07b362a3c06 SHA1 e952c7e4909082540bbf3ca1bc745a223880116a SHA256 8ce1c42a0a19e39d7db7b4e944f59b867d9f3c44c71df6ea3573dae9de83a7d5 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 8234 RMD160 c79e9d27146173f229725ecd763b6815277a0d88 SHA1 77ea3d77758b1269e6acd092f01eab3822a1004d SHA256 4354a30dbc3e5671b0fef49ba816bc35e5e0065dd107ad808654243fe1ad2764 +MISC ChangeLog 8415 RMD160 a2db0c2543f61ce2fde13b7f3fb1d5ec0b759481 SHA1 127ad19b2233c8ba69bcc14d1c15019dcec6ca67 SHA256 3a16a20ea0e1b4fb0b2650abe5ab00fe7620b6b97ce56d3562212ed486c40452 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.14-r10.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.14-r10.ebuild new file mode 100644 index 000000000..5eb4ca4bd --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.14-r10.ebuild @@ -0,0 +1,35 @@ +# 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.14-r4 + =sys-apps/calculate-templates-2.2.14-r3 + =sys-apps/calculate-lib-2.2.14-r2 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.14-r1 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.14-r3 ) + cl_client? ( =sys-apps/calculate-client-2.2.14 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.14 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.14 ) + + cl_server? ( =sys-apps/calculate-server-2.1.13-r2 ) +"