From 3172fcac1313adf33d00f26259042527661c4fa0 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 22 Aug 2011 16:55:27 +0400 Subject: [PATCH] Update calculate-utilities. --- sys-apps/calculate-assemble/ChangeLog | 7 + sys-apps/calculate-assemble/Manifest | 4 +- .../calculate-assemble-2.2.21-r1.ebuild | 27 +++ .../files/calculate-assemble-2.2.21-r1.patch | 104 ++++++++++++ sys-apps/calculate-i18n/ChangeLog | 6 + sys-apps/calculate-i18n/Manifest | 4 +- .../calculate-i18n-2.2.21-r1.ebuild | 33 ++++ .../files/calculate-i18n-2.2.21-r1.patch | 22 +++ sys-apps/calculate-install/ChangeLog | 7 + sys-apps/calculate-install/Manifest | 4 +- .../calculate-install-2.2.21-r2.ebuild | 42 +++++ .../files/calculate-install-2.2.21-r2.patch | 155 ++++++++++++++++++ sys-apps/calculate-lib/ChangeLog | 6 + sys-apps/calculate-lib/Manifest | 4 +- .../calculate-lib-2.2.21-r1.ebuild | 35 ++++ .../files/calculate-lib-2.2.21-r1.patch | 13 ++ sys-apps/calculate-templates/ChangeLog | 7 + sys-apps/calculate-templates/Manifest | 4 +- .../calculate-templates-2.2.21-r1.ebuild | 37 +++++ .../files/calculate-templates-2.2.21-r1.patch | 94 +++++++++++ sys-apps/calculate-utilities/ChangeLog | 6 + sys-apps/calculate-utilities/Manifest | 3 +- .../calculate-utilities-2.2.21-r2.ebuild | 37 +++++ 23 files changed, 655 insertions(+), 6 deletions(-) create mode 100644 sys-apps/calculate-assemble/calculate-assemble-2.2.21-r1.ebuild create mode 100644 sys-apps/calculate-assemble/files/calculate-assemble-2.2.21-r1.patch create mode 100644 sys-apps/calculate-i18n/calculate-i18n-2.2.21-r1.ebuild create mode 100644 sys-apps/calculate-i18n/files/calculate-i18n-2.2.21-r1.patch create mode 100644 sys-apps/calculate-install/calculate-install-2.2.21-r2.ebuild create mode 100644 sys-apps/calculate-install/files/calculate-install-2.2.21-r2.patch create mode 100644 sys-apps/calculate-lib/calculate-lib-2.2.21-r1.ebuild create mode 100644 sys-apps/calculate-lib/files/calculate-lib-2.2.21-r1.patch create mode 100644 sys-apps/calculate-templates/calculate-templates-2.2.21-r1.ebuild create mode 100644 sys-apps/calculate-templates/files/calculate-templates-2.2.21-r1.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.21-r2.ebuild diff --git a/sys-apps/calculate-assemble/ChangeLog b/sys-apps/calculate-assemble/ChangeLog index b41da721a..a5f7cae5d 100644 --- a/sys-apps/calculate-assemble/ChangeLog +++ b/sys-apps/calculate-assemble/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-assemble-2.2.21-r1 (22 Aug 2011) + + 22 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-assemble-2.2.21-r1.ebuild, + +files/calculate-assemble-2.2.21-r1.patch: + Update for bugfix and features + *calculate-assemble-2.2.21 (18 Aug 2011) 18 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-assemble/Manifest b/sys-apps/calculate-assemble/Manifest index b107587f6..cb3e7f40b 100644 --- a/sys-apps/calculate-assemble/Manifest +++ b/sys-apps/calculate-assemble/Manifest @@ -1,6 +1,7 @@ AUX calculate-assemble-2.2.19_2.2.20_rc1.patch 8966 RMD160 03d7a9cd1618024297516c589500a29038d462eb SHA1 30368ed435082461f1649f2707e595a50f50e045 SHA256 1793266fead73af7f8b1cc391ea49a78d53f36749982dba248d3fa93ae04827b AUX calculate-assemble-2.2.20-display_deps.patch 3079 RMD160 d16172ee69262d0237e40cadee96bf345f2a232e SHA1 1ee60f16746c843454644499bfd61170a4d2f9af SHA256 5ea0b6ca3f3edf3efe1ea2cbe2e3577bf91813513a997b36791935241a8c766b AUX calculate-assemble-2.2.20-fix_disk_dev.patch 765 RMD160 7e37e874e4d2508833c4d3707fbe1eadf44c30d6 SHA1 a81c11334684c5cb868efa42db584ca3ad0f059c SHA256 9f1a65f07370c00d0e17c2273da50aaa91368a921f7ae065dca4569cc6ebfa13 +AUX calculate-assemble-2.2.21-r1.patch 4446 RMD160 c1b14f8abd0c590c9e95ce240b660d0ecc8e8948 SHA1 a96932a08140ac3751454c403c2f9423b8e534c0 SHA256 5c42ee4b07a2905992b4128cb759a48f26745af1ee53ac621ebe0fdf2d2847f8 DIST calculate-assemble-2.2.18.tar.bz2 33018 RMD160 2c3ae7f1d27c3ad8d5f956d08fa3a676bad8831c SHA1 93737556574d527aae29221a8fe1a0849b962a43 SHA256 25953004f54550c54491498c8bde11fd0761b17bf830d12b0c3a4b6028fd5713 DIST calculate-assemble-2.2.19.tar.bz2 25088 RMD160 ec39e5cd4a331da903555bd01c41ee1c9090a25a SHA1 c88a78cd82bc6307ce1763ce1421a54d2870e8af SHA256 84f4a4346d438a6a978783db4b6206c22ee0b0eb0026aff191c9af908bf4d43b DIST calculate-assemble-2.2.20.tar.bz2 25241 RMD160 6e318195c86b332c100cb7d8737c35305bd2f10a SHA1 a410e30320c5cfc37ef1a34e8cdd70aafe8dbded SHA256 d606729494cc6883d4553cbdc5d0393811afeca714731760e63886ad8af2f01c @@ -11,7 +12,8 @@ EBUILD calculate-assemble-2.2.19.ebuild 481 RMD160 a62e8dff13102f6177e7613f865e7 EBUILD calculate-assemble-2.2.20-r1.ebuild 633 RMD160 b87a5a4c18f1e2c4df4b7c3fc7176c167e11324a SHA1 674f1a74e5f894e2b21f6025f6f779a559aed7c1 SHA256 57e015406b8721a4d72ad5000824a7355eeea56f6ac4197715fc801b6d7174f9 EBUILD calculate-assemble-2.2.20-r2.ebuild 730 RMD160 5aba49bb15e3cf5b8db0e18583393f35b8b5c5ed SHA1 83ac8f370db3e9e19d06e882e997d05adff3ca0a SHA256 7ad30ac668bb8e8806d39d7cdbfb738c6fbc0518584bd9f4240784233b1b9e72 EBUILD calculate-assemble-2.2.20.ebuild 481 RMD160 0dbf26e99b73a2ed32fa64aae37041954b432f8c SHA1 1ab75e7e4b1e7aa7bd0b7fba1dca7ea080b0c60c SHA256 6bf79b34ee46ab93dd17ac7bd75a5d073aa7a79daa83e58a85ee3f99301c2fbe +EBUILD calculate-assemble-2.2.21-r1.ebuild 598 RMD160 e2c5ededba4f4baf850222ddcd77affc2d98afbb SHA1 75b3760188ee350831ee60b85214b6bdcb874b08 SHA256 9335f9606a96044faa2ea00bc1f4e567c1d218600f4ffbf8acc6cf776972e0a5 EBUILD calculate-assemble-2.2.21.ebuild 481 RMD160 69d8ff833b54faf18a7b969fd7f9831458ab89ee SHA1 5c4384299f784a2c086624256e933a7299278474 SHA256 e1037ab96c92fbeb3a1556489d6776e8e2c872c2a534296a09fca51dd0d4892a EBUILD calculate-assemble-2.2.9999.ebuild 482 RMD160 a8dd82b9ec70dd999e13c509f0f11f303bdbf5c7 SHA1 a5218cd678aa8d213ee8455874e7ea0b07246ebc SHA256 2c0fed30ccde6401d214a6de67dc63a0c91fd025508efb3519db9b2cda800ec9 -MISC ChangeLog 12103 RMD160 6176b03bb98f7d9de1890aa7e3003776d4e5973d SHA1 3c9cb44940da595218ea597df418ced61a86058c SHA256 deaa7993de4a18fbf8896de26786ebf5435b26088307a15511eeeaea3358c917 +MISC ChangeLog 12327 RMD160 7581c9a73e329c3e1157d4f146f94158aa1cb167 SHA1 3a7104f1feddd1a1df39e04819d37743078f6728 SHA256 1c2c323865a65848740eaa0c58806f03f8e3f6bb9f1a94f67060f559a59397b5 MISC metadata.xml 273 RMD160 7d99331acd3ba20fc7ae361cb845f33f73d994ee SHA1 92e19e1e4c24527654168ac0cf9fe58ba78aeb4d SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943 diff --git a/sys-apps/calculate-assemble/calculate-assemble-2.2.21-r1.ebuild b/sys-apps/calculate-assemble/calculate-assemble-2.2.21-r1.ebuild new file mode 100644 index 000000000..2f084ad06 --- /dev/null +++ b/sys-apps/calculate-assemble/calculate-assemble-2.2.21-r1.ebuild @@ -0,0 +1,27 @@ +# 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" + +DEPEND="~sys-apps/calculate-builder-2.2.21" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # some bugfix + epatch "${FILESDIR}/calculate-assemble-2.2.21-r1.patch" +} diff --git a/sys-apps/calculate-assemble/files/calculate-assemble-2.2.21-r1.patch b/sys-apps/calculate-assemble/files/calculate-assemble-2.2.21-r1.patch new file mode 100644 index 000000000..3430b4575 --- /dev/null +++ b/sys-apps/calculate-assemble/files/calculate-assemble-2.2.21-r1.patch @@ -0,0 +1,104 @@ +diff --git pym/cl_assemble.py pym/cl_assemble.py +index 126f263..3da2a6a 100644 +--- pym/cl_assemble.py ++++ pym/cl_assemble.py +@@ -1632,51 +1632,54 @@ class cl_assemble(color_print): + self.clVars.Get('cl_assemble_pkgdir')) + dbPkg = pathJoin(chrootPath, 'var/db/pkg') + +- if not path.exists(dbPkg): +- os.makedirs(dbPkg) +- if not path.exists(pkgDir): +- os.makedirs(pkgDir) +- if path.exists(dbPkg) and path.exists(pkgDir): +- # get pkg list from distro +- pkgList = \ +- reduce(lambda x,y:x+y, +- map(lambda x:map(lambda z:path.join(x,"%s.tbz2"%z), +- os.listdir(path.join(dbPkg,x))), +- os.listdir(dbPkg)),[]) +- # get binary packages +- binList = \ +- reduce(lambda x,y:x+y, +- map(lambda x:map(lambda z:path.join(x,z)[len(pkgDir)+1:], +- os.listdir(path.join(x))), +- filter(lambda x:path.isdir(x), +- map(lambda x:path.join(pkgDir,x), +- os.listdir(pkgDir)))),[]) +- +- # remove files which in binary and not in db/pkg +- map(lambda x:os.unlink(x), +- map(lambda x:pathJoin(pkgDir,x), +- list(set(binList)-set(pkgList)))) +- +- # remove empty directories +- map(lambda x:os.rmdir(x), +- filter(lambda x:path.isdir(x) and not os.listdir(x), +- map(lambda x:path.join(pkgDir,x), +- os.listdir(pkgDir)))) +- +- #packagesDir = 'usr/portage/packages' +- #x11_drivers = 'x11-drivers' +- #nvidiaDir = pathJoin(chrootPath, packagesDir,x11_drivers) +- +- #pkgDirX11Drivers = pathJoin(pkgDir,'x11-drivers') +- #if not path.exists(pkgDirX11Drivers): +- # os.makedirs(pkgDirX11Drivers,mode=0755) +- #map(lambda x:copyfile(pathJoin(nvidiaDir,x), +- # pathJoin(pkgDirX11Drivers,x)), +- # listDirectory(nvidiaDir)) +- +- self.regenPackages(chrootPath,pkgDir[len(chrootPath):]) +- else: +- self.printByResult(skip=True) ++ try: ++ if not path.exists(dbPkg): ++ os.makedirs(dbPkg) ++ if not path.exists(pkgDir): ++ os.makedirs(pkgDir) ++ if path.exists(dbPkg) and path.exists(pkgDir): ++ # get pkg list from distro ++ pkgList = \ ++ reduce(lambda x,y:x+y, ++ map(lambda x:map(lambda z:path.join(x,"%s.tbz2"%z), ++ os.listdir(path.join(dbPkg,x))), ++ os.listdir(dbPkg)),[]) ++ # get binary packages ++ binList = \ ++ reduce(lambda x,y:x+y, ++ map(lambda x:map(lambda z:path.join(x,z)[len(pkgDir)+1:], ++ os.listdir(path.join(x))), ++ filter(lambda x:path.isdir(x), ++ map(lambda x:path.join(pkgDir,x), ++ os.listdir(pkgDir)))),[]) ++ ++ # remove files which in binary and not in db/pkg ++ map(lambda x:os.unlink(x), ++ map(lambda x:pathJoin(pkgDir,x), ++ list(set(binList)-set(pkgList)))) ++ ++ # remove empty directories ++ map(lambda x:os.rmdir(x), ++ filter(lambda x:path.isdir(x) and not os.listdir(x), ++ map(lambda x:path.join(pkgDir,x), ++ os.listdir(pkgDir)))) ++ ++ #packagesDir = 'usr/portage/packages' ++ #x11_drivers = 'x11-drivers' ++ #nvidiaDir = pathJoin(chrootPath, packagesDir,x11_drivers) ++ ++ #pkgDirX11Drivers = pathJoin(pkgDir,'x11-drivers') ++ #if not path.exists(pkgDirX11Drivers): ++ # os.makedirs(pkgDirX11Drivers,mode=0755) ++ #map(lambda x:copyfile(pathJoin(nvidiaDir,x), ++ # pathJoin(pkgDirX11Drivers,x)), ++ # listDirectory(nvidiaDir)) ++ ++ self.regenPackages(chrootPath,pkgDir[len(chrootPath):]) ++ else: ++ self.printByResult(skip=True) ++ except OSError,e: ++ raise AssembleError(str(e)) + return True + + def createMaskList(self,chrootdir,filename): diff --git a/sys-apps/calculate-i18n/ChangeLog b/sys-apps/calculate-i18n/ChangeLog index 9bf10ef09..a6b09e196 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.21-r1 (22 Aug 2011) + + 22 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-i18n-2.2.21-r1.ebuild, +files/calculate-i18n-2.2.21-r1.patch: + Update for calculate-install translate + *calculate-i18n-2.2.21 (18 Aug 2011) 18 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-i18n/Manifest b/sys-apps/calculate-i18n/Manifest index f99848bca..a5c3177bc 100644 --- a/sys-apps/calculate-i18n/Manifest +++ b/sys-apps/calculate-i18n/Manifest @@ -5,6 +5,7 @@ AUX calculate-i18n-2.2.20-btrfs.patch 797 RMD160 7979e726cc50369f2242c8c8ca089fa AUX calculate-i18n-2.2.20-for_assemble.patch 995 RMD160 ee251a5d04a2b7c4a1f54d461aff7c97658f3a96 SHA1 cfb77845fef84873cd4a2895aff706397a46fec9 SHA256 faf17b5e3e72f9d94ed363b6a935be62a086c5b9a4bf4b804cc00a003b08c89b AUX calculate-i18n-2.2.20-r2.patch 790 RMD160 14bdc03c42582f34af58a1311f9c92c888911183 SHA1 619db7605250073395e82ea5a24d1e12fa6f5bca SHA256 22066aaf7c62bfe089ae8be933ec73a4faec88086ac6578b9eb77cdb2f481bd1 AUX calculate-i18n-2.2.20-r4.patch 126252 RMD160 c5fef72a39012010ac26aaa3bdcce1d5e7895da2 SHA1 24e18fb3f50fe8b34cee07e2895fb214d02212a3 SHA256 a6959afc9048114df21e3119cee75ba667f3004832954c558dd3b72f794857fa +AUX calculate-i18n-2.2.21-r1.patch 1143 RMD160 9ab755b1be226b0bac00431aad21d2351e3397f1 SHA1 a842bdd273348f170ec5237d5019550c894e90c3 SHA256 9b8789b9f8e399220771bf836b2580b810ebdad7614919393fc68a1f9a39776c 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 @@ -17,7 +18,8 @@ EBUILD calculate-i18n-2.2.20-r2.ebuild 802 RMD160 96934c239a74ce55e377d77cdefc18 EBUILD calculate-i18n-2.2.20-r3.ebuild 888 RMD160 b42ae96868e48414a70d062308ee7d94810f27e1 SHA1 4a14d0c3d5128c4a0ceb878b4a7c17b0e1289338 SHA256 751482c07d83c10359de078134d12cf34d97c414d58cabff184ea76ead345b3b EBUILD calculate-i18n-2.2.20-r4.ebuild 971 RMD160 0179f413681adb5288e00448c350529dc08e88e6 SHA1 ca80d8a14b138190e78f16ff4e8dc3b03f623bed SHA256 1c70722a23f5f7a32b5eca8cfe11105b0b8f1c26f055f22ef593aed7c3b5bb32 EBUILD calculate-i18n-2.2.20.ebuild 682 RMD160 7c158a21d27de99c219ced2043fddd4f6629a132 SHA1 0d112aab5e8857131b30969a9011fed2f26955b8 SHA256 d9b2a1b26c155475f01d3e42dd15f0222f786b21806fe2fbc7f5b91285394e09 +EBUILD calculate-i18n-2.2.21-r1.ebuild 812 RMD160 4f1843dedbe340f7e1ab943217b97b69b83c214c SHA1 1fc9ccb8c4769866d0a732df2d579569f2f0db4d SHA256 985acb8ccbe46401be5764fbe969a841ac25530952bcc080caada81d17705a04 EBUILD calculate-i18n-2.2.21.ebuild 682 RMD160 7c158a21d27de99c219ced2043fddd4f6629a132 SHA1 0d112aab5e8857131b30969a9011fed2f26955b8 SHA256 d9b2a1b26c155475f01d3e42dd15f0222f786b21806fe2fbc7f5b91285394e09 EBUILD calculate-i18n-2.2.9999.ebuild 680 RMD160 b3d1cfb1045bc3b5da1be318c13fd15919f16aef SHA1 acfe16d8ac67eb88426f46980df3892d7c5a7de7 SHA256 623a395dd35d2620e697b9f8c97d58d3a7220cade8b3a69186050d921d26b802 -MISC ChangeLog 2141 RMD160 393a76c81c293fae42693959ff7fe2fe9eda7c10 SHA1 0f2a1a9dfa9d04e2529a31d1d296ab2666ec6158 SHA256 98b0bbeaf97cda8d35b2eff0baf86b4c3b6cc583f8eba0a7ecffb139ed45dec8 +MISC ChangeLog 2359 RMD160 d3b454f4c2e5a1d0fc98c406f8db35b8f0c5aa31 SHA1 66d619f7beb15b4538d0f6e1ff684c45de7cfe78 SHA256 07ecc28a519239b0da2224f29ca76d71d71db01fcf13a39095adf367f9e63aa7 MISC metadata.xml 276 RMD160 d9730825fc3ad1b5ea7ba45704121ebd29e38b11 SHA1 c4c1576efbc38119efca43cfa273cb9f433f1de1 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c diff --git a/sys-apps/calculate-i18n/calculate-i18n-2.2.21-r1.ebuild b/sys-apps/calculate-i18n/calculate-i18n-2.2.21-r1.ebuild new file mode 100644 index 000000000..90684a679 --- /dev/null +++ b/sys-apps/calculate-i18n/calculate-i18n-2.2.21-r1.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-install-2.2.21-r2.ebuild, + +files/calculate-install-2.2.21-r2.patch: + Update for bugfix and features + *calculate-install-2.2.21-r1 (19 Aug 2011) 19 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest index 68f45cee5..162c94bb3 100644 --- a/sys-apps/calculate-install/Manifest +++ b/sys-apps/calculate-install/Manifest @@ -14,6 +14,7 @@ AUX calculate-install-2.2.20-many_bugfix.patch 16735 RMD160 3b860cb7d0d2e216186c AUX calculate-install-2.2.20-net_network.patch 1496 RMD160 142d7420565283eee8949b6c21afbd6806e72ab3 SHA1 6f112deaf6b9b47bbf1afc7c93464dda96546265 SHA256 93ccc4026a767cac3f9e861ffe1e7a3299ce2b3f808cd10ff684a60f0c47b6f8 AUX calculate-install-2.2.20_2.2.21_rc1.patch 36707 RMD160 279605cc9ce454e93f5620d0151eaa5b5a83dc09 SHA1 f5e3104b869d74ae207604d6685924d79a2a1223 SHA256 b68a756710d7abf60fc61b0154e870e152b2d2d533e1ccf229189555f933e796 AUX calculate-install-2.2.21-r1.patch 1059 RMD160 b78b780b87f73504c45c4b9e6feb89a4489e101a SHA1 5eb9ff84ed9bf9c7a6b8706bda463451ccc804ea SHA256 412598c1c2ebe23f245f1e0597b0938b9be76050e8b21906c053202b9ec54025 +AUX calculate-install-2.2.21-r2.patch 5802 RMD160 3b73c9b524785f6c1c1f82537bfff46b78d49dde SHA1 eb0954ca648bd0f0e2eabcb7b9da740c869bd518 SHA256 7c10369cd59f4a9fff6b2ebf0c7897f622edfbd8d9fc62aec296b9f6bb2a0cf8 DIST calculate-install-2.2.18.tar.bz2 75850 RMD160 56b1058d1977957cc6ceb8322a049af4dbb8f0cc SHA1 4e990cf5bd6310942b54995293f1f7ea82726aa9 SHA256 2a1b9c3fa93a958f19f05af51f80adf25f5ee0867452fac0304ec721de19cd97 DIST calculate-install-2.2.19.tar.bz2 63943 RMD160 8c76315aea89d20239b11c7e6017766b5e5e93db SHA1 1127468d3b221333e820e142fc1b9afaef507ee3 SHA256 5dedcb4c3d42ca4d87b2a2fa0d72704be3748865907b991dddbeba493e0da80a DIST calculate-install-2.2.20.tar.bz2 65317 RMD160 f91f5b8e6a1f3a41cda246a983274b7665a98259 SHA1 a530fcc91cbb952e36e4e42175c45182d828a987 SHA256 06e3360e3d9e3e599d6696f121908390a241baa16fe9400657ea0a29c0f85fc1 @@ -40,7 +41,8 @@ EBUILD calculate-install-2.2.20-r8.ebuild 938 RMD160 d2beaf2db6e430ca8e0357f3805 EBUILD calculate-install-2.2.20-r9.ebuild 938 RMD160 d2beaf2db6e430ca8e0357f380558453fe30fea9 SHA1 3b57794dcf2cfbe5c0815b58f43fb8d4a8fb3803 SHA256 6e14bf1ee6ea50e2e1d59f5fb26b77535eb722c01d740b8f173adb80db6e3c83 EBUILD calculate-install-2.2.20.ebuild 774 RMD160 975cdfee5054db3a097a2edbd5bbd4db002b921d SHA1 efdeb24c9021ccbe384190f2e742d41620dd3e20 SHA256 549b961eeb2d3bcbfa526f3b5ed0368439a599e8a797d229a60bc8d0d7ae33c5 EBUILD calculate-install-2.2.21-r1.ebuild 960 RMD160 616508e423d7926c59c3c52a53b085fa28a174ac SHA1 57c81447cabf469331299f74ff4771a4f41a6487 SHA256 80e0fecf61a6ee9d13fe5dba1eefc276aeb07c49c745092581657b599e3883f8 +EBUILD calculate-install-2.2.21-r2.ebuild 920 RMD160 458c506b292ce35083eee533ed507c46ffa1ee0a SHA1 04ed11daac73bd33e862e76318ad7a38305f10a8 SHA256 b05d919b5611cfe0aa019ce4deeeef5a218142b47ea0c90f7dff060cb88c497f EBUILD calculate-install-2.2.21.ebuild 804 RMD160 97f3e98ea3fd7bdf8e54ee23b5c2661c8962e19f SHA1 e7759746ffe19f70c159961a3e261bd09f2e89a1 SHA256 c6d80514eb5cd12eb9e9f687fdd54e2cbc1727a1e2b5b5cc3541e67536d51841 EBUILD calculate-install-2.2.9999.ebuild 595 RMD160 8f9b9a14fed39ded9c2a9d9343aa4e892d620172 SHA1 09aff28bdaa486868e2caddc7911732a905336ee SHA256 534e6c6e465177e269ce7beed96dab08a124878591088c1bf38095e855ca1180 -MISC ChangeLog 26884 RMD160 12bce332228cacdc5309ed6782b52694febdef1e SHA1 78cf7efbec7cb3e6e14bfe0363fa2c1aa1e388df SHA256 c2b99df169e2497f6efe317173421d8c6b794fc4399bf8435d67098db63aaef9 +MISC ChangeLog 27105 RMD160 3e9b1d8cd05816f6949082b07e04dc7aa2682e55 SHA1 e154c532a1c7445a9a0710a778576343ba06b95c SHA256 d9c6860ac7d3c7d301a98987ce62157508831d2eb9f5570d3124641594cdd9a0 MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846 diff --git a/sys-apps/calculate-install/calculate-install-2.2.21-r2.ebuild b/sys-apps/calculate-install/calculate-install-2.2.21-r2.ebuild new file mode 100644 index 000000000..72874bec2 --- /dev/null +++ b/sys-apps/calculate-install/calculate-install-2.2.21-r2.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 installation Calculate Linux" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="minimal" + +DEPEND="~sys-apps/calculate-templates-2.2.21 + ~sys-apps/calculate-lib-2.2.21 + app-portage/layman + !app-misc/livecd-tools + !minimal? ( sys-boot/grub + sys-apps/gptfdisk + >=sys-apps/util-linux-2.19.1 + sys-fs/dosfstools + sys-fs/squashfs-tools + sys-block/parted )" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # some bugfix + epatch "${FILESDIR}/calculate-install-2.2.21-r2.patch" +} + +pkg_postinst() { + einfo "For configure calculate-install perform:" + einfo " cl-install --install" +} diff --git a/sys-apps/calculate-install/files/calculate-install-2.2.21-r2.patch b/sys-apps/calculate-install/files/calculate-install-2.2.21-r2.patch new file mode 100644 index 000000000..808e5ddee --- /dev/null +++ b/sys-apps/calculate-install/files/calculate-install-2.2.21-r2.patch @@ -0,0 +1,155 @@ +diff --git data/calculate data/calculate +index 1ad6e8d..b6ad94a 100755 +--- data/calculate ++++ data/calculate +@@ -66,7 +66,8 @@ install_video_driver() + + # create user guest if system has not non-root user + create_nonroot_user() { +- if [[ -z $(variable_value cl_migrate_user | sed -r "s/[][,']|root//g") ]] && ++ if which cl-desktop &>/dev/null && ++ [[ -z $(variable_value cl_migrate_user | sed -r "s/[][,']|root//g") ]] && + [[ `variable_value os_install_linux_system` != "server" ]] + then + # passwd of non root user +@@ -83,16 +84,19 @@ create_nonroot_user() { + + # create/update all user profile + configure_users() { +- for user in $(variable_value cl_migrate_user | sed -r "s/[][,']//g") +- do +- cl-desktop $user +- done ++ if which cl-desktop &>/dev/null ++ then ++ for user in $(variable_value cl_migrate_user | sed -r "s/[][,']//g") ++ do ++ cl-desktop $user ++ done ++ fi + } + + start() { + install_video_driver +- LANG=C /usr/bin/cl-install --startup + LANG=C create_nonroot_user ++ LANG=C /usr/bin/cl-install --startup + LANG=C configure_users + + /usr/sbin/env-update +diff --git pym/cl_distr.py pym/cl_distr.py +index 057e50d..b8775ad 100644 +--- pym/cl_distr.py ++++ pym/cl_distr.py +@@ -136,7 +136,7 @@ class DistributiveRepository: + """Get info from content""" + origfilename = filename + if filename in DistributiveRepository.contentCache: +- return DistributiveRepository.contentCache[filename] ++ return DistributiveRepository.contentCache[filename].copy() + varsShare = self.varsShare + distr = None + # may be directory is isodir (directory which contains iso image) +@@ -184,7 +184,7 @@ class DistributiveRepository: + if distr: + distr.close() + DistributiveRepository.contentCache[origfilename] = d +- return d ++ return d.copy() + + def _getdistrinfo(self,filename): + """Get information by distributive""" +@@ -729,6 +729,7 @@ class PartitionDistributive(Distributive): + 'jfs':'/sbin/mkfs.jfs %s -f %s', + 'reiserfs':'/sbin/mkfs.reiserfs %s -f %s', + 'btrfs':'/sbin/mkfs.btrfs %s %s', ++ 'nilfs2':'/sbin/mkfs.nilfs2 %s %s', + 'xfs':'/sbin/mkfs.xfs %s -f %s', + 'vfat':'/usr/sbin/mkfs.vfat %s -F 32 %s', + 'ntfs-3g':'/usr/sbin/mkfs.ntfs %s -FQ %s', +@@ -739,6 +740,7 @@ class PartitionDistributive(Distributive): + 'ext3':'-L %s', + 'ext4':'-L %s', + 'btrfs':'-L %s', ++ 'nilfs2':'-L %s', + 'jfs':'-L %s', + 'reiserfs':'-l %s', + 'xfs':'-L %s', +@@ -752,6 +754,7 @@ class PartitionDistributive(Distributive): + 'ext4' : '83', + 'reiserfs' : '83', + 'btrfs' : '83', ++ 'nilfs2' : '83', + 'jfs' : '83', + 'xfs' : '83', + 'vfat' : '0b', +@@ -763,6 +766,7 @@ class PartitionDistributive(Distributive): + 'ext4' : '0700', + 'reiserfs' : '0700', + 'btrfs' : '0700', ++ 'nilfs2' : '0700', + 'jfs' : '0700', + 'xfs' : '0700', + 'vfat' : '0700', +diff --git pym/cl_install.py pym/cl_install.py +index 4f83b51..2358f7f 100644 +--- pym/cl_install.py ++++ pym/cl_install.py +@@ -305,6 +305,10 @@ class convertDictOpt: + "pair":{}, + "incompatible":[], + "makefs":"/sbin/mkfs.btrfs"}, ++ "nilfs2":{"options":[], ++ "pair":{}, ++ "incompatible":[], ++ "makefs":"/sbin/mkfs.nilfs2"}, + "jfs":{"options":[], + "pair":{}, + "incompatible":[], +@@ -1634,10 +1638,10 @@ class cl_install(color_print, SignalInterrupt): + _("Legacy grub not support boot from raid or lvm without" + " separate /boot partition")) + return False +- if bootDiskFormat == "btrfs": ++ if bootDiskFormat in ("btrfs","nilfs2"): + self.printERROR( +- _("Legacy grub not support boot from btrfs without" +- " separate /boot partition")) ++ _("Legacy grub not support boot from %s without" ++ " separate /boot partition")%bootDiskFormat) + return False + return True + +diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py +index 3cfa6dd..8ef2078 100644 +--- pym/cl_install_cmd.py ++++ pym/cl_install_cmd.py +@@ -508,3 +508,15 @@ class install_cmd(share_cmd): + return True + else: + return False ++ ++ def parse_args(self, args=None, values=None): ++ """ ++ Preparse for catch non option --live ++ """ ++ rargs = self.optobj._get_args(args) ++ if rargs: ++ for arg in rargs: ++ if arg == "--live": ++ self.optobj.error(_("option %s:") %"--live" +\ ++ " " + _("option is depricated, use '--startup' option")) ++ return self.optobj.parse_args(args,values) +diff --git scripts/cl-install scripts/cl-install +index 441f504..e8e572d 100644 +--- scripts/cl-install ++++ scripts/cl-install +@@ -32,7 +32,7 @@ if __name__ == "__main__": + install = install_cmd() + install.logicObj.initVars() + # set lang +- ret = install.optobj.parse_args() ++ ret = install.parse_args() + if ret is False: + sys.exit(1) + options, args = ret diff --git a/sys-apps/calculate-lib/ChangeLog b/sys-apps/calculate-lib/ChangeLog index 26511bb46..9ff08d447 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.2.21-r1 (22 Aug 2011) + + 22 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-lib-2.2.21-r1.ebuild, +files/calculate-lib-2.2.21-r1.patch: + Update for bugfix and features + *calculate-lib-2.2.21 (18 Aug 2011) 18 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest index 03edea35f..24f7b8fda 100644 --- a/sys-apps/calculate-lib/Manifest +++ b/sys-apps/calculate-lib/Manifest @@ -9,6 +9,7 @@ AUX calculate-lib-2.2.20-fix_get_part_type.patch 829 RMD160 ab31d9af866d2c1e4e61 AUX calculate-lib-2.2.20-fix_getsize.patch 666 RMD160 6234c06190001330eaeebd05ca94d386dcc66300 SHA1 e3bd8ea3573fc05b2693f7abf24b98e70c5641c5 SHA256 e96742e70defb712975e5d7385ccef6031bb6e37133cbb9feb0911e2fb4bef18 AUX calculate-lib-2.2.20-ini_ver.patch 8555 RMD160 ecfd91f26e456f5d445657caf08a21daa3d7d152 SHA1 0896fe763d845a07966be5c3a9056e2f1ef30e2e SHA256 a82284d823524e2c3ee7b0b0c129807fff529833de5b1df2f56f1648c69de0e2 AUX calculate-lib-2.2.20-many_bugfix.patch 1712 RMD160 7126b42d731b88f6736e5a1734db96c8f11004f7 SHA1 29b7d3d749e1fe60548cfd789bc2a0e6ec60111b SHA256 fd6fc8a09999faa84cdeafbf37f035e38294bde14cbb0e5b40cddea21b9026a7 +AUX calculate-lib-2.2.21-r1.patch 688 RMD160 b41bcdd4ddffef8bb421e070413f9a311b7daf26 SHA1 9522425937b894e3f8c676becb306fc0c8243940 SHA256 086af7a26af45755b40afd3a050d413eaf8ba314088d1a38af36466ca400a990 DIST calculate-lib-2.1.11.tar.bz2 61687 RMD160 93ca4f84ff2cd7018addfd4de162959d78e51f78 SHA1 53149951c346fea7709cb43b4d8ebefe63acb0fd SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 DIST calculate-lib-2.1.8.tar.bz2 61178 RMD160 4a4ed063a9b4d3b82723f5f6eb046c97ad9fcda1 SHA1 93eb20057afff6e98c409388e1259a3ad078bb7a SHA256 ef8e315001663da7a45e69b82dc7c158fb0e10bd567efa95bf8a654ed441144a DIST calculate-lib-2.2.18.tar.bz2 111559 RMD160 294326d180c3de46ef1f5c56d4da10313e123d87 SHA1 e6340c81573421eca1f8b882f4a4929830df8bdd SHA256 8e8c0124ab9e2efa270fba9529c36a4dd12aa6d616d005e35945bbd999b6a3a5 @@ -34,8 +35,9 @@ EBUILD calculate-lib-2.2.20-r3.ebuild 849 RMD160 8d82dd218a1a8474316a7b7e34cbf9e EBUILD calculate-lib-2.2.20-r4.ebuild 974 RMD160 2cb7d913857a532e586a25f424702d70bd1861d4 SHA1 f22d741c059ffdae5b0dd61e04458d20005a7c26 SHA256 a0fd84de0d8508ab8480ce3987d483b44c1fb2080c902bb708f1a5464cf805dc EBUILD calculate-lib-2.2.20-r5.ebuild 974 RMD160 2cb7d913857a532e586a25f424702d70bd1861d4 SHA1 f22d741c059ffdae5b0dd61e04458d20005a7c26 SHA256 a0fd84de0d8508ab8480ce3987d483b44c1fb2080c902bb708f1a5464cf805dc EBUILD calculate-lib-2.2.20.ebuild 666 RMD160 890df4d0d047196b4afa183a28f828835eb32447 SHA1 faaaeeae26b5a1f5f790ff118f5d8bea7899a778 SHA256 899c8c4267cdd8044002777b1d63c7b6d36a03f7cb792f82e4e7299b7352de1e +EBUILD calculate-lib-2.2.21-r1.ebuild 803 RMD160 5b731301841711a4ee28e8ae4a9c04a3497382a7 SHA1 dab7d1f7308c04f1c82db49f5e1873620dc367d3 SHA256 e070d3ae1d6e2657bddefbb0543e9578275e21b028d635c34ecb5d94f7cd4693 EBUILD calculate-lib-2.2.21.ebuild 685 RMD160 43e6ab9361d04ac60f06819ac4f6a31ab452868a SHA1 f6d64ea2484b2eb610385824eebff0ebd54180ea SHA256 64c4353505d85dc3fedb46ef4b50cc27a546dcf549f9e7f3272b0554872c1460 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 24986 RMD160 99b209a30551799488bb8c1981db9fbc0275ddd8 SHA1 74bda29ec88d8ea059d8ba1ba4a27424a48c1968 SHA256 8d1da4ea2ee50c2b8ff763a31ca4127b322312fb2d0c4b4a167fc361d6b06b23 +MISC ChangeLog 25193 RMD160 e9273ee0ea0a70337c5148ce751db960220402d2 SHA1 87ab8b6118c6a0537459bc9e4f41f38937475561 SHA256 b0bdb75e26e72f5b80abb4d861be2c1f0c2621022e63bd39ac5dcf9816557b65 MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec diff --git a/sys-apps/calculate-lib/calculate-lib-2.2.21-r1.ebuild b/sys-apps/calculate-lib/calculate-lib-2.2.21-r1.ebuild new file mode 100644 index 000000000..0c0135187 --- /dev/null +++ b/sys-apps/calculate-lib/calculate-lib-2.2.21-r1.ebuild @@ -0,0 +1,35 @@ +# 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="2.2" +KEYWORDS="amd64 x86" +IUSE="minimal" +DEPEND="!=dev-python/pyxml-0.8 + sys-apps/iproute2 + sys-apps/pciutils + sys-fs/lvm2 + sys-fs/mdadm + sys-apps/file[python]" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # update for bugfix + epatch "${FILESDIR}/calculate-lib-2.2.21-r1.patch" +} diff --git a/sys-apps/calculate-lib/files/calculate-lib-2.2.21-r1.patch b/sys-apps/calculate-lib/files/calculate-lib-2.2.21-r1.patch new file mode 100644 index 000000000..a9ce85a12 --- /dev/null +++ b/sys-apps/calculate-lib/files/calculate-lib-2.2.21-r1.patch @@ -0,0 +1,13 @@ +diff --git pym/cl_template.py pym/cl_template.py +index 66a2634..f282401 100644 +--- pym/cl_template.py ++++ pym/cl_template.py +@@ -2506,7 +2506,7 @@ class templateFunction(_error, _shareTemplate, _shareTermsFunction): + self.pathConfigIni = os.path.join(self.homeDir, ".calculate") + self.modeConfigIni = 0640 + else: +- self.pathConfigIni = pathJoin(self._baseDir,'/etc/calculate') ++ self.pathConfigIni = pathJoin(self._chrootDir,'/etc/calculate') + self.modeConfigIni = 0644 + self.fileConfigIni = os.path.join(self.pathConfigIni,"ini.env") + # Словарь времен модификации env файлов diff --git a/sys-apps/calculate-templates/ChangeLog b/sys-apps/calculate-templates/ChangeLog index 05ab99632..b04c33040 100644 --- a/sys-apps/calculate-templates/ChangeLog +++ b/sys-apps/calculate-templates/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-templates-2.2.21-r1 (22 Aug 2011) + + 22 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-templates-2.2.21-r1.ebuild, + +files/calculate-templates-2.2.21-r1.patch: + Update for bugfix and features + *calculate-templates-2.2.20-r2 (16 Aug 2011) 16 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest index dff59a653..52612e2d9 100644 --- a/sys-apps/calculate-templates/Manifest +++ b/sys-apps/calculate-templates/Manifest @@ -5,6 +5,7 @@ AUX calculate-templates-2.2.19_lvmraid_rc1.patch 16330 RMD160 e8bfaecc5cc2156ce0 AUX calculate-templates-2.2.19_scandelay.patch 8416 RMD160 815420f40999284d111df95945c209381a4a9947 SHA1 68c86862a32332105a8d7df9f3b4a11b90023928 SHA256 63bc8754b196124b9bbcc89ccd945d07eb76191f7b8547bc541cab4e4474b9bf AUX calculate-templates-2.2.20-fix_cpufreq.patch 2333 RMD160 9b30c305e53000435b644ddd83a7726953433898 SHA1 5ac7f06fb7355d93af3b1d9ab02b5aac55592081 SHA256 c30bbb7d107f899c1fac8a6defcc7951d59fe5d5523df7bcbf1394bf617125bb AUX calculate-templates-2.2.20-fix_mplayer.patch 2537 RMD160 97d2a54996d96065eea9078d95bad24a11c5ddbe SHA1 89dd1da77ee7e40f5b468aba8db97bdf5eff7f9d SHA256 777c3797ebc8b29f30fa2572fb0047037dbc8c50422764d5e1ad6d4d2f665bc9 +AUX calculate-templates-2.2.21-r1.patch 4162 RMD160 4c8e5e8e2162ff9a58f09ed3646350587dec5f80 SHA1 c94b55a767251723799fa81c25373f9cca4c2279 SHA256 7cfcabcd241625f05f9a477ce8024732f47e2c7b44448d2466f18bf34ddd39ff 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 @@ -20,7 +21,8 @@ EBUILD calculate-templates-2.2.19.ebuild 581 RMD160 72bb0867731be7212291c74f1aef EBUILD calculate-templates-2.2.20-r1.ebuild 708 RMD160 964788ae0547fc380504ef115dd43394f7a681f9 SHA1 4deb056941a1e1c3c9690d865907c922d854cd6b SHA256 cb9ad1156d2f047da06de1c73f56ebca1646051e7eccac4b1b3f16f1cd111af1 EBUILD calculate-templates-2.2.20-r2.ebuild 843 RMD160 12e3ca9a026072e3272746252033d81a3f1a0be4 SHA1 c5388c0eb20481a5c03239dbb5932f0188a14721 SHA256 b2b373aba91266c3773ed66a90b6970bbda267009add802d730578f8221bc1f4 EBUILD calculate-templates-2.2.20.ebuild 581 RMD160 58415efe9da270f3cbac7be53099e3b3f2d0e9a1 SHA1 4cbf60bac722618b31285280de2279e809c2499f SHA256 e2045f5b13588448a0ab90b751fa4ba76ef85725af4401f34da4499f55053d9c +EBUILD calculate-templates-2.2.21-r1.ebuild 695 RMD160 2a38bb7a5c1dc424ce9c9d95fbef8e70a6e485c0 SHA1 ff937d7663857debdacb52fbc8e9c0dc0f0e3f58 SHA256 b4092bab5c9ce7ec500cac4b32b6ea8a9ed706a3688e7ea68257b9664d4bd96e EBUILD calculate-templates-2.2.21.ebuild 581 RMD160 3e8c0e9fd308c52caa861955c86a390a96127202 SHA1 9541b46b0bcf618c33285fd6e5f7167a72e92b31 SHA256 002834f9b50c2641a462562c68ad6715ab32c1c86723af664a833bc3be85eaec EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 14e53f7c05efbb563b793b1025669cbe79d0838c SHA1 226d287ce0a00609ed6c871321abf5000565227e SHA256 5df16332077472571e2d4aae47e958d1e6efe3a8d694b61053778f75a537142f -MISC ChangeLog 27942 RMD160 cb4eeec10023fd19fa9d32432860655240454b2e SHA1 009b0686d6be9ebe375fe265b5fb56b7114263c8 SHA256 82a5f60da220c8f77be3b442dfc352450343c51b554afca8798f94d606eb2811 +MISC ChangeLog 28169 RMD160 bca1b00a85562a44fdc8bcd345dea3e820cdd00a SHA1 4961cfc861a2fb573e295833897f4b5a1036ebeb SHA256 a369af8f40b33e2368b0f926844e8d009c5cfd81aab12c7428a5f2ec8e3ba77c MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.21-r1.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.21-r1.ebuild new file mode 100644 index 000000000..68d57f7bc --- /dev/null +++ b/sys-apps/calculate-templates/calculate-templates-2.2.21-r1.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.21" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # bugfixs + epatch "${FILESDIR}/calculate-templates-2.2.21-r1.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.21-r1.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.21-r1.patch new file mode 100644 index 000000000..3f55c28bd --- /dev/null +++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.21-r1.patch @@ -0,0 +1,94 @@ +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals +index 4015931..150bd84 100644 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals ++++ desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals +@@ -5,15 +5,7 @@ emoticonsTheme=KMess-Cartoon + + #Fonts + [General] +-#?pkg(www-client/chromium)!=# +-BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop +-#pkg# +-#?pkg(www-client/firefox)!=&&pkg(www-client/chromium)==# +-BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop +-#pkg# +-#?pkg(www-client/firefox)==&&pkg(www-client/chromium)==# +-BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop +-#pkg# ++BrowserApplication[$e]=file:///usr/share/applications/calculate-browser.desktop + XftHintStyle=hintmedium + #?pkg(media-fonts/droid)!=# + desktopFont=Droid Sans,10,-1,5,50,0,0,0,0,0 +diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop +index 5f21119..a0bc2a5 100644 +--- install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop ++++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop +@@ -1,4 +1,4 @@ +-# Calculate format=kde link=/usr/share/applications/audacious2.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=2.4 ++# Calculate format=kde link=/usr/share/applications/audacious2.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=2.4&&pkg(media-sound/audacious)<3.0 + + # Update info + #-ini(desktop.audioplayer, audacious)-# +diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop +new file mode 100644 +index 0000000..6387c9e +--- /dev/null ++++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop +@@ -0,0 +1,9 @@ ++# Calculate format=kde link=/usr/share/applications/audacious.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=3.0 ++ ++# Update info ++#-ini(desktop.audioplayer, audacious)-# ++ ++# Hide icon ++[Desktop Entry] ++OnlyShowIn=X-NeverShowThis; ++ +diff --git install/1merge/calculate-desktop/.calculate_directory install/1merge/calculate-desktop/.calculate_directory +new file mode 100644 +index 0000000..437bd6a +--- /dev/null ++++ install/1merge/calculate-desktop/.calculate_directory +@@ -0,0 +1,2 @@ ++# Calculate belong()!=&&cl_chroot_status==off&&pkg(sys-apps/calculate-desktop)!= name=etc path=/usr name=bin ++ +diff --git install/1merge/calculate-desktop/xautologin install/1merge/calculate-desktop/xautologin +new file mode 100644 +index 0000000..5387eb1 +--- /dev/null ++++ install/1merge/calculate-desktop/xautologin +@@ -0,0 +1,8 @@ ++# Calculate chmod=0755 ++#!/bin/bash ++#?list(cl_migrate_user,1)!=# ++export USER=#-list(cl_migrate_user,1)-# ++/usr/share/calculate/xdm/xdm --login ++su - #-list(cl_migrate_user,1)-# -c "/bin/bash -lc startx" ++/usr/share/calculate/xdm/xdm --logout ++#list# +diff --git install/1merge/xorg-server/conf.d/xdm install/1merge/xorg-server/conf.d/xdm +index eb21521..d6f5cdf 100644 +--- install/1merge/xorg-server/conf.d/xdm ++++ install/1merge/xorg-server/conf.d/xdm +@@ -1,12 +1,15 @@ + # Calculate comment=# + + CHECKVT=7 +-#?pkg(kde-base/kdm)!=# ++#?os_install_root_type==livecd||os_install_linux_shortname==CMC# ++DISPLAYMANAGER="xautologin" ++#os_install_root_type# ++#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(kde-base/kdm)!=# + DISPLAYMANAGER="kdm" +-#pkg# +-#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==# ++#os_install_root_type# ++#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==# + DISPLAYMANAGER="gdm" +-#pkg# +-#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==# ++#os_install_root_type# ++#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==# + DISPLAYMANAGER="slim" +-#pkg# ++#os_install_root_type# diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index ea8b81b28..ea0414d74 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.21-r2 (22 Aug 2011) + + 22 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.21-r2.ebuild: + Update for templates,lib,install,assemble and i18n + *calculate-utilities-2.2.21-r1 (19 Aug 2011) 19 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 479276bf2..1c9a05593 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -31,6 +31,7 @@ EBUILD calculate-utilities-2.2.20-r8.ebuild 874 RMD160 48712477e41efeaf75903e5f2 EBUILD calculate-utilities-2.2.20-r9.ebuild 874 RMD160 5ff0ffa5245061f5ffe5292cfba868e98a6241a9 SHA1 817d412a924a443c2e1b96abb2f63d23dc03adcd SHA256 b853c43c9ba82a594c8d2101a749fc2783bac9c25c4e4226aabb1e889642efd9 EBUILD calculate-utilities-2.2.20.ebuild 862 RMD160 192cb774b0a4c7dc0ce9f12a7736ad2f62febe14 SHA1 709c0aeb568224264988e15c4f914187eb6c00c2 SHA256 33618ea225c693f3a532f146e0ebcd7ac5d86c121dedb0f8cc7cfda8e938569d EBUILD calculate-utilities-2.2.21-r1.ebuild 865 RMD160 d09702a54724755cca89e16bccb953ebad700625 SHA1 95f6bf58c10b76813b785edb86a434aaebd6d0a1 SHA256 7c2179eb3b399f465ce81ad5e705b35f605f2620d08fc179fe57159773be8e35 +EBUILD calculate-utilities-2.2.21-r2.ebuild 877 RMD160 a1adfa7c7080b83fe20c407d7d7417b8ce6f03ae SHA1 68a1b428712369e87ad313bd2d2603ea83f26705 SHA256 483d5803fa79eca8ff47ee41c14098802e0b9b4f554044aa12052be1a04dd6a6 EBUILD calculate-utilities-2.2.21.ebuild 862 RMD160 3786826c24e6bfc0fb9e5b413c85e429ae412723 SHA1 8beb4139d5f2828421d57c4ab7ba6e8a2e59d9ef SHA256 530ea787bfee6bd4308bb782b82a42f0e60d02fa692877135f3fe8402c4ba677 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 20241 RMD160 544af2e0752b366a01d51a5ee8e0a49e11e79d5a SHA1 66edd894ffe946f350fb2eea3b54293a5f6c5270 SHA256 57c02bf60b37dce62f2821f49421dda50978465db945392cd6e2555d6bb349dd +MISC ChangeLog 20442 RMD160 5e3c7155f7a6854750e1927c838fdef91483f76f SHA1 41e27d9f0dd47aa5071fb257fab8df6c51aa7682 SHA256 d19d76a3547a524b69ad481fbb2f5a5a48cc3ced4df170994b782af90b042ff4 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.21-r2.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.21-r2.ebuild new file mode 100644 index 000000000..4165b8dc3 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.21-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 + +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.21-r2 + =sys-apps/calculate-templates-2.2.21-r1 + =sys-apps/calculate-lib-2.2.21-r1 + =sys-apps/calculate-i18n-2.2.21-r1 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.21-r1 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.21 ) + cl_client? ( =sys-apps/calculate-client-2.2.21 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.21 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.21 ) + + cl_server? ( =sys-apps/calculate-server-2.1.14-r6 ) +" +