diff --git a/sys-apps/calculate-builder/ChangeLog b/sys-apps/calculate-builder/ChangeLog index c63b091b8..59d8c699a 100644 --- a/sys-apps/calculate-builder/ChangeLog +++ b/sys-apps/calculate-builder/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-builder-2.2.22-r1 (29 Aug 2011) + + 29 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-builder-2.2.22-r1.ebuild, + +files/calculate-builder-2.2.22-dispatch_conf.patch: + Update for feature + *calculate-builder-2.2.22 (26 Aug 2011) 26 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-builder/Manifest b/sys-apps/calculate-builder/Manifest index b5dfc7b10..9c4d5a1aa 100644 --- a/sys-apps/calculate-builder/Manifest +++ b/sys-apps/calculate-builder/Manifest @@ -1,4 +1,5 @@ AUX calculate-builder-2.2.19_2.2.20_rc1.patch 1927 RMD160 5c5f11e5397b04c022bc3307fcc81defcacdf5c4 SHA1 eb0ff12a50ab216d5443b93023dfa201891f6a3b SHA256 5f9b5fa5ceebf676d464f71cdfa8a235653af628b0c6f19be5272c6688a640c5 +AUX calculate-builder-2.2.22-dispatch_conf.patch 1239 RMD160 964bfa44e5753c6e2154d4add40e97e2b54a7589 SHA1 4c5f3b0bc945c7533f72ad2b7e0b702f391537d7 SHA256 a2efa975a7881eb76009aab31e127fbb97e2a531a80cb815f40160855800960f DIST calculate-builder-2.2.18.tar.bz2 30995 RMD160 de051bfc8def67c6adc7c08be6610ed022b0e079 SHA1 5271a56e017acaa0e9fe38fd6717d2ef5ecb4ac8 SHA256 0598342020ebb0008ad7a4ac66c42317663ac153c6f74ed313a7b020b2154c1c DIST calculate-builder-2.2.19.tar.bz2 26464 RMD160 82481411bd5976a3d217dd9a9889b6f90eca1ab2 SHA1 9dc278e441437b31fc6f6a79b41d9c1ec25d5102 SHA256 e87d392255e6de8453594ccde04f0385430bdcd605650e115be7c80ee3a53261 DIST calculate-builder-2.2.20.tar.bz2 26589 RMD160 a313f05452a8d382d35d7b73203cc78d1431c8dc SHA1 887e68cc1c534f848ef0b8a795d6335b8a4ea42b SHA256 77a377f2bf66c408f4e77b1f96dd7484fb4ffad47b026e72ef0c2f19b3d27600 @@ -9,7 +10,8 @@ EBUILD calculate-builder-2.2.19-r1.ebuild 723 RMD160 008bf8285d8e32006284b45c801 EBUILD calculate-builder-2.2.19.ebuild 590 RMD160 1f89c579d9ebf99dd5213f186ea755b83b77ec82 SHA1 fcfc550be07936b5386d9d955c1689ec167dda8f SHA256 25398c06fd102441f694d270cc9348795abbd2f20df0cf21eb7b3137d3b5e524 EBUILD calculate-builder-2.2.20.ebuild 590 RMD160 ed36427d69477ee8998e23a9244a838b5920ed48 SHA1 2161372c3ab91218b3c81dd114711826605f79aa SHA256 a90dd01318fa33120651bb5928402de7544c9ae8bd2bbe788ca06366669bebfb EBUILD calculate-builder-2.2.21.ebuild 590 RMD160 77e8acd113dfe6c24eecf19d99fcb1a4b07e8ac6 SHA1 92380f0ac7886c46f338a604d7ee07f006149d5a SHA256 09126eca71ea6dd007f3f177e8c211dc5e582811b5cfed01c9459ca9a662177b +EBUILD calculate-builder-2.2.22-r1.ebuild 727 RMD160 24da78b86f79ebb1d22511b183e11f46e661b636 SHA1 c31241a65f9fd1bd1668d6703eaa2b1257ebc646 SHA256 7c142796513b7ec88cd1b55bd9f5bbb8f5eef8fdd03542c0ae222644571d0bb3 EBUILD calculate-builder-2.2.22.ebuild 590 RMD160 75600caab5c8d5c94f823138e8938aa01a1790f1 SHA1 254d7e611b5afa0bb5e4c267e292202e3eb8a7f6 SHA256 96fba1a295df4911021eeb3d3f3e9f9538a384a57e03e0f4e062e113cd52d75a EBUILD calculate-builder-2.2.9999.ebuild 555 RMD160 e803b87aed06b8f08e2637e10213a0d81ba3ba0b SHA1 3ed908155f477cfa91155420d4fae903ce8db1da SHA256 fd6326f73e68d91f476498db381f2af62e742e3c461b609a8eb379dc417e1470 -MISC ChangeLog 15368 RMD160 140365445506682248633d5f4b13be28a8710807 SHA1 f5e8be3b46fd65c45fa565b5f36a598ffb77c83d SHA256 317ebbdbf98360ac7a9915e597430c909ecadada93673c5a231e2f42f6516300 +MISC ChangeLog 15588 RMD160 3523567d76e86916c6d031c05b5a0f9b0e041dea SHA1 99225e3a8a038fa0c861650f11c3af5dcd7545a7 SHA256 38ddaa66daf00bb6aaabe0612ef7ff4761bcaf348345a1366b703bef9a23f639 MISC metadata.xml 270 RMD160 b5ff308a82cd6e594c2f04731cdbe9f80a945042 SHA1 58dbf7eb15bb2e6c6c8514f483e51dfacd1c62e9 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0 diff --git a/sys-apps/calculate-builder/calculate-builder-2.2.22-r1.ebuild b/sys-apps/calculate-builder/calculate-builder-2.2.22-r1.ebuild new file mode 100644 index 000000000..0babbb5dd --- /dev/null +++ b/sys-apps/calculate-builder/calculate-builder-2.2.22-r1.ebuild @@ -0,0 +1,31 @@ +# 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 builder tasks of Calculate Linux" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND=">=sys-kernel/calckernel-3.4.15-r5 + ~sys-apps/calculate-install-2.2.22 + ! +Date: Mon Aug 29 11:10:47 2011 +0400 + + Add execute dispatch conf before iso pack. + +diff --git pym/cl_builder.py pym/cl_builder.py +index 572e6c7..0e2d119 100644 +--- pym/cl_builder.py ++++ pym/cl_builder.py +@@ -231,6 +231,13 @@ class cl_builder(color_print): + removeKernelSources) + self.printByResult(True) + ++ def dispatchConf(self, distrPath): ++ """Execute dispatch conf for """ ++ self.printMessageForTest(_("Execute '%s'")%"dispatch-conf") ++ # run dispatch conf interactive ++ os.system("chroot %s /bin/bash -c '/usr/sbin/dispatch-conf'"% ++ distrPath) ++ + def prepareSourceDistributive(self,distr): + """Unmount all bind,proc mount points from source distribute""" + mp = self.clVars.Get('cl_builder_path') +@@ -243,6 +250,7 @@ class cl_builder(color_print): + self.printByResult(True) + distrPath = distr.convertToDirectory().getDirectory() + self.cleanNeedlessKernelData(distrPath) ++ self.dispatchConf(distrPath) + + if self.assembleIso and \ + self.clVars.Get('os_builder_profile').endswith('binary'): diff --git a/sys-apps/calculate-install/ChangeLog b/sys-apps/calculate-install/ChangeLog index 2d2617050..ee9079f9b 100644 --- a/sys-apps/calculate-install/ChangeLog +++ b/sys-apps/calculate-install/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-install-2.2.22-r1 (29 Aug 2011) + + 29 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-install-2.2.22-r1.ebuild, + +files/calculate-install-2.2.22-r1.patch: + Update for features + *calculate-install-2.2.22 (26 Aug 2011) 26 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest index a7edde71f..a3eba4c54 100644 --- a/sys-apps/calculate-install/Manifest +++ b/sys-apps/calculate-install/Manifest @@ -17,6 +17,7 @@ AUX calculate-install-2.2.21-r1.patch 1059 RMD160 b78b780b87f73504c45c4b9e6feb89 AUX calculate-install-2.2.21-r2.patch 5802 RMD160 3b73c9b524785f6c1c1f82537bfff46b78d49dde SHA1 eb0954ca648bd0f0e2eabcb7b9da740c869bd518 SHA256 7c10369cd59f4a9fff6b2ebf0c7897f622edfbd8d9fc62aec296b9f6bb2a0cf8 AUX calculate-install-2.2.21-r3.patch 18457 RMD160 2aceaf84cc1df2da2ad55846e499ade724a2eaad SHA1 e76ea035b2fffbe08e28cb065a6a2f62dc7bd738 SHA256 b976a06eb1f644654952241429113549f854c4b99ebefa28249a24afac16116c AUX calculate-install-2.2.21-r4.patch 21745 RMD160 28c1f6f07679026427ebe9b83ea82c94cab4a546 SHA1 1afde387c2465c303aec5a339b393a58d415371a SHA256 6136768eecd676a83c7d7bd2c775b6f16b9fc6b3329edb5671dea737c201afda +AUX calculate-install-2.2.22-r1.patch 14684 RMD160 a21d98228bf1359cc175a9362c6f19629f9f2836 SHA1 1b762db6e3b8a554d9831755f307a060c62c8b8e SHA256 d63b8e2b362a7c4c4bb735b333f6b444b3271444022e022fd673c995fea23f5b 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 @@ -48,7 +49,8 @@ EBUILD calculate-install-2.2.21-r2.ebuild 920 RMD160 458c506b292ce35083eee533ed5 EBUILD calculate-install-2.2.21-r3.ebuild 937 RMD160 e17e318ad8f41758ee3b63505ed8cda5c2e220b4 SHA1 401c3f9bdcfe961f9106f5b93d06f58cb46c5c7b SHA256 d927d383bf6650e0600c0e1619ebe6c655ffe8cd0239bef8ceb2e46e0b573c22 EBUILD calculate-install-2.2.21-r4.ebuild 936 RMD160 681150ef763dcf81f7cf03e38f3f38cf57680774 SHA1 641760d259e8e6e450876bba7be798d98d9aaed3 SHA256 701f7d64866b32a6facab38fabbb9fdc8654ae7d50d27204b2182189f75f2e84 EBUILD calculate-install-2.2.21.ebuild 804 RMD160 97f3e98ea3fd7bdf8e54ee23b5c2661c8962e19f SHA1 e7759746ffe19f70c159961a3e261bd09f2e89a1 SHA256 c6d80514eb5cd12eb9e9f687fdd54e2cbc1727a1e2b5b5cc3541e67536d51841 +EBUILD calculate-install-2.2.22-r1.ebuild 925 RMD160 ac0f26beb482bd7fb41b7454036e4a06ea4937e1 SHA1 a486e1a792983027d5016ba8167330439fe0ebe2 SHA256 25ec4e58f09fa78847ba931e21bb7ebbf6a4be13e3c495b42327b959be907958 EBUILD calculate-install-2.2.22.ebuild 804 RMD160 f011db7025c81f626ce9d85fba4a96c26cb3498b SHA1 758b096513299357983dfb3aa768940cf9ccbda3 SHA256 df1d9df0112e396d62de4ef9402756d6596ef26dede6fcdb850af8efe0f58758 EBUILD calculate-install-2.2.9999.ebuild 595 RMD160 8f9b9a14fed39ded9c2a9d9343aa4e892d620172 SHA1 09aff28bdaa486868e2caddc7911732a905336ee SHA256 534e6c6e465177e269ce7beed96dab08a124878591088c1bf38095e855ca1180 -MISC ChangeLog 27692 RMD160 996914de19e0429b9117c64486afbef7c5b3856a SHA1 487aec5f20323569f0436e600259b99b250a8b29 SHA256 cbcd89f92ed5493514bbbaf9c79247c94236ab26524a8cd0530830b25de5830c +MISC ChangeLog 27902 RMD160 107d5ee2adf9ede8e58e5901b8119e5fa486dd6e SHA1 5d0839887334a12349d9ccfc6b52b657c1f99570 SHA256 cad060ea4a0df314c90291c14fee956c127e79998fdfb2e6448795b116bc5d76 MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846 diff --git a/sys-apps/calculate-install/calculate-install-2.2.22-r1.ebuild b/sys-apps/calculate-install/calculate-install-2.2.22-r1.ebuild new file mode 100644 index 000000000..93aecc3b9 --- /dev/null +++ b/sys-apps/calculate-install/calculate-install-2.2.22-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 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.22 + ~sys-apps/calculate-lib-2.2.22 + 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}" + + # add four options + epatch "${FILESDIR}/calculate-install-2.2.22-r1.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.22-r1.patch b/sys-apps/calculate-install/files/calculate-install-2.2.22-r1.patch new file mode 100644 index 000000000..064e84f51 --- /dev/null +++ b/sys-apps/calculate-install/files/calculate-install-2.2.22-r1.patch @@ -0,0 +1,330 @@ +diff --git man/cl-install.1 man/cl-install.1 +index a843c0b..d8ab5c0 100644 +--- man/cl-install.1 ++++ man/cl-install.1 +@@ -115,6 +115,26 @@ Network address of NTP timeserver. + Don't use UUID device names. If specified, usual device names (/dev/sda1, etc.) will be used. Use if you sure in what you do. + .RE + .PP ++\fB\-\-video\fR \fIVIDEODRV\fR ++.RS 4 ++Change Xorg video driver. ++.RE ++.PP ++\fB\-X\fR \fIx\fR ++.RS 4 ++Change Xorg server resolution. ++.RE ++.PP ++\fB\-\-fb\fR \fIx\fR ++.RS 4 ++Change frame buffer resolution. ++.RE ++.PP ++\fB\-\-timezone\fR \fITIMEZONE\fR ++.RS 4 ++Changes timezone. ++.RE ++.PP + \fB\-\-set\fR \fIVAR=VALUE\fR + .RS 4 + Changes internal variable value of Calculate utilities. For multiple values changing use the option required number of times. +diff --git man/ru/cl-install.1 man/ru/cl-install.1 +index 57993a7..f0b90b3 100644 +--- man/ru/cl-install.1 ++++ man/ru/cl-install.1 +@@ -110,6 +110,26 @@ IPv4 адрес сети с указанием CIDR. IFACE может обозн + Сетевой адрес сервера времени NTP. + .RE + .PP ++\fB\-\-video\fR \fIVIDEODRV\fR ++.RS 4 ++Изменить видео драйвер для Xorg сервера. ++.RE ++.PP ++\fB\-X\fR \fI<ширина>x<высота>\fR ++.RS 4 ++Изменить разрешение для Xorg сервера. ++.RE ++.PP ++\fB\-\-fb\fR \fI<ширина>x<высота>\fR ++.RS 4 ++Изменить разрешение для frame buffer. ++.RE ++.PP ++\fB\-\-timezone\fR \fITIMEZONE\fR ++.RS 4 ++Изменить часовой пояс. ++.RE ++.PP + \fB\-\-nouuid\fR + .RS 4 + Не использовать UUID имена устройств. При установке параметра будут использоваться привычные имена устройств (/dev/sda1 и т.п.). Используйте данный параметр если уверены. +@@ -201,7 +221,7 @@ cl-install -d /dev/sda2 + .PP + Смена видеодрайвера на 'fglrx'. Перед выполнением убедитесь, что у вас установлен пакет 'x11-drivers/ati-drivers'. + .nf +-cl-install --startup --set os_install_x11_video_drv=fglrx ++cl-install --startup --video fglrx + .fi + .PP + Установка системы на несколько разделов. В примере система будет установлена на раздел sda2, все настройки, в том числе данные пользователя будут вынесены в раздел sda5. Раздел sda1 будет использован в качестве 'swap'. +diff --git pym/cl_fill_install.py pym/cl_fill_install.py +index 6756b70..c92d3d4 100644 +--- pym/cl_fill_install.py ++++ pym/cl_fill_install.py +@@ -911,18 +911,7 @@ class fillVars(object, glob_attr): + + def get_os_install_clock_timezone(self): + """timezone for clock""" +- zoneinfodir = "/usr/share/zoneinfo/" +- localtimefile = "/etc/localtime" +- timezonefile = "/etc/timezone" +- # try get timezone from kernel calculate param +- timezone = self.getValueFromCmdLine("calculate",2) +- if timezone and \ +- path.exists(path.join(zoneinfodir,timezone)): +- return timezone +- # get timezone from /etc/timezone +- if path.exists(timezonefile): +- return open(timezonefile,"r").read().strip() +- return "UTC" ++ return self.Get('os_clock_timezone') + + def get_os_install_clock_type(self): + """type of clock (UTC or local)""" +diff --git pym/cl_install.py pym/cl_install.py +index 9b07add..43752b9 100644 +--- pym/cl_install.py ++++ pym/cl_install.py +@@ -27,7 +27,7 @@ from cl_utils import runOsCommand,appendProgramToEnvFile, \ + scanDirectory,process,getTupleVersion, \ + detectDeviceForPartition,listDirectory, \ + cmpVersion,STDOUT,getUdevDeviceInfo, \ +- getLvmPartitions ++ getLvmPartitions,getInstalledVideo + from cl_vars_share import varsShare + + from cl_kernel_utils import KernelConfig,InitRamFs +@@ -2291,6 +2291,19 @@ class cl_install(color_print, SignalInterrupt): + self.printMessageForTest(_("Restore initramfs")) + self.printByResult(InitRamFs(initrdInstallPath)\ + .cleanInitRamFs(initrdPath)) ++ oldXdrv = self.clVars.Get('os_x11_video_drv') ++ newXdrv = self.clVars.Get('os_install_x11_video_drv') ++ if oldXdrv != newXdrv: ++ kmsDrv = ("radeon","i915","intel","nouveau","ati") ++ self.defaultPrint("\n") ++ if oldXdrv in kmsDrv or newXdrv in kmsDrv: ++ self.defaultPrint( ++ _("To apply changes you must reboot the system") ++ +".\n") ++ else: ++ self.defaultPrint( ++ _("To apply changes you must restart the X server") ++ +".\n") + except (InstallError,DistributiveError),e: + error = e + except Exception,e: +@@ -2640,3 +2653,29 @@ the system") + " (yes/no)" + else: + self.printERROR(_("Wrong image file")) + return False ++ ++ def setVideo(self,video,startup=False): ++ """Set video driver""" ++ if startup: ++ if not video in getInstalledVideo(prefix="/") and \ ++ not video in ("auto","other"): ++ self.printERROR(_("%s videodriver is unavailable")%video) ++ if video == "nvidia": ++ self.printERROR(_("Install %s driver by command:")%"NVidia") ++ self.printERROR(" emerge x11-drivers/nvidia-drivers") ++ if video == "fglrx": ++ self.printERROR(_("Install %s driver by command:")%"ATI") ++ self.printERROR(" emerge x11-drivers/ati-drivers") ++ return False ++ self.clVars.Set('os_install_x11_video_drv',video,force=True) ++ return True ++ ++ def setTimezone(self,timezone): ++ """Set timezone""" ++ if not path.exists(path.join("/usr/share/zoneinfo",timezone)) or \ ++ timezone.startswith('/usr/share/zoneinfo'): ++ self.printERROR(_("%s timezone is wrong")%timezone) ++ return False ++ else: ++ self.clVars.Set('os_install_clock_timezone',timezone,force=True) ++ return True +diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py +index 8ef2078..a17ce4b 100644 +--- pym/cl_install_cmd.py ++++ pym/cl_install_cmd.py +@@ -124,6 +124,22 @@ CMD_OPTIONS = [{'shortOption':"d", + 'optVal':"NTP", + 'help':_("set ntp server for system") + }, ++ {'longOption':"video", ++ 'optVal':"VIDEODRV", ++ 'help':_("set video driver") ++ }, ++ {'shortOption':"X", ++ 'optVal':"x", ++ 'help':_("set Xorg resolution") ++ }, ++ {'longOption':"fb", ++ 'optVal':"x", ++ 'help':_("set frame buffer resolution") ++ }, ++ {'longOption':"timezone", ++ 'optVal':"TIMEZONE", ++ 'help':_("set timezone") ++ }, + {'longOption':"nouuid", + 'help':_("do not use UUID") + }, +@@ -177,6 +193,9 @@ class install_cmd(share_cmd): + self.optionsStartupIncompatible = ["type","d", "b", "mbr", + "w", "f","U", "s","install","uninstall","build","u"] + self.optionsDhcpIncompatible = ["ip","gateway","dns"] ++ self.errorWithExample = \ ++ _("option {optname}: {errormess}:" ++ " '{value}' (example: '{example}')") + + def _getNamesAllSetOptions(self): + """Get list set options""" +@@ -214,6 +233,17 @@ class install_cmd(share_cmd): + self.optobj.error(_("incompatible options")+":"+" %s"\ + %self.getStringIncompatibleOptions(opts)) + ++ def __checkByReg(self,reg="",value="",valueopt="",valuename="",example=""): ++ """Check option specifed by value""" ++ if value: ++ if not re.match(reg,value): ++ self.optobj.error(self.errorWithExample.format( ++ optname=valueopt, ++ errormess=_("%s specifing error")%valuename, ++ value=value, ++ example=example)) ++ ++ + def checkOpts(self, values, args): + """Check values all specified options.""" + if len(args) > 0: +@@ -233,28 +263,36 @@ class install_cmd(share_cmd): + errMsg = _("incorrect option") + ":" + " %s" %"--xml" +\ + ": " + _("use with option '-v'") + self.optobj.error(errMsg) ++ self.__checkByReg(reg="^\d+x\d+$",value=values.X,valueopt="-X", ++ valuename=_("X resolution"),example="1024x768") ++ self.__checkByReg(reg="^\d+x\d+$",value=values.fb,valueopt="--fb", ++ valuename=_("frame buffer resolution"), ++ example="1024x768") + if values.ip: + for ipaddr in values.ip: + if not re.match("^(\w+:)?%s$"%iputils.IP_ADDR_NET,ipaddr): +- self.optobj.error(_("option %s:") %"--ip" +\ +- " " + _("ip specifing error: '{ip}' " +- "(example: '{example}')").format(\ +- ip=ipaddr,example="eth0:192.168.0.21/16")) ++ self.optobj.error(self.errorWithExample.format( ++ optname="--ip", ++ errormess=_("%s specifing error")%"ip", ++ value=ipaddr, ++ example="eth0:192.168.0.21/16")) + if not values.dns is None: + if not re.match("(^{0}(,{0})*|)$".format(iputils.IP_ADDR),values.dns): +- self.optobj.error(_("option %s:") %"--dns" +\ +- " " + _("dns specifing error: '%s'") %\ +- values.dns) ++ self.optobj.error(self.errorWithExample.format( ++ optname="--dns", ++ errormess=_("%s specifing error")%"dns", ++ value=values.dns, ++ example="8.8.8.8")) + if values.route: + for route in values.route: + if not re.match("^({net}|default):(({ipaddr})?" + "(:\w+(:{ipaddr})?)?)?$".format( + net=iputils.IP_ADDR_NET,ipaddr=iputils.IP_ADDR),route): +- self.optobj.error(_("option %s:") %"--route" +\ +- " " + _("route specifing error: '{route}'" +- "(example: '{example}'").format( +- route=route, +- example="default:192.168.1.1")) ++ self.optobj.error(self.errorWithExample.format( ++ optname="--route", ++ errormess=_("%s specifing error")%_("route"), ++ value=route, ++ example="default:192.168.1.1")) + if not (values.install or values.uninstall or values.startup): + if values.v is False and \ + not values.p and \ +@@ -266,17 +304,21 @@ class install_cmd(share_cmd): + reTrueDisk = re.compile("^[^:]+(:[^:]*){0,3}$") + wrongValue = filter(lambda x: not reTrueDisk.match(x),values.d) + if wrongValue: +- self.optobj.error(_("option %s:") %"d" +\ +- " " + _("disk specifing error: '%s'")\ +- %", ".join(wrongValue)) ++ self.optobj.error(self.errorWithExample.format( ++ optname="-d", ++ errormess=_("%s specifing error")%_("disk"), ++ value=", ".join(wrongValue), ++ example="/dev/sda2:/:ext4")) + # check syntax SWAP_DISK + if values.w: + reTrueBind = re.compile("^[^:]+$") + wrongValue = filter(lambda x: not reTrueBind.match(x),values.w) + if wrongValue: +- self.optobj.error(_("option %s:") %"w" +\ +- " " + _("mount bind specifing error: '%s'")\ +- %", ".join(wrongValue)) ++ self.optobj.error(self.errorWithExample.format( ++ optname="-w", ++ errormess=_("%s specifing error")%_("disk"), ++ value=", ".join(wrongValue), ++ example="/dev/sda1")) + #check boot device + if values.mbr: + bootDisk = values.mbr +@@ -340,6 +382,23 @@ class install_cmd(share_cmd): + + def setVars(self,options): + """Process setting values for variables""" ++ values = self.optobj.values ++ if values.video: ++ if not self.logicObj.setVideo(values.video, ++ startup=values.startup): ++ return False ++ if values.X: ++ if not self.clVars.Set('os_install_x11_resolution', values.X, ++ force=True): ++ return False ++ if values.fb: ++ if not self.clVars.Set('os_install_fb_resolution', ++ "%s-32"%values.fb, ++ force=True): ++ return False ++ if values.timezone: ++ if not self.logicObj.setTimezone(values.timezone): ++ return False + if options.set: + for vals in options.set: + for val in vals.split(','): +diff --git setup.py setup.py +index fb3670a..748151f 100755 +--- setup.py ++++ setup.py +@@ -111,9 +111,10 @@ class install_man( install_data ) : + + def finalize_options(self): + install_data.finalize_options(self) ++ self.data_files = [] + for root,dirs,files in os.walk(BUILD_MAN_PATH): + for filename in files: +- self.data_files = [(path.join(self.install_dir,root[6:]), ++ self.data_files += [(path.join(self.install_dir,root[6:]), + [path.join(root,filename)])] + + class cl_install_data(install_data): diff --git a/sys-apps/calculate-lib/ChangeLog b/sys-apps/calculate-lib/ChangeLog index ae16b82f6..0b0675ab9 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.22-r1 (29 Aug 2011) + + 29 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-lib-2.2.22-r1.ebuild, +files/calculate-lib-2.2.22-timezone.patch: + Update for features + *calculate-lib-2.2.22 (26 Aug 2011) 26 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest index dd7c5382b..e79a9230a 100644 --- a/sys-apps/calculate-lib/Manifest +++ b/sys-apps/calculate-lib/Manifest @@ -11,6 +11,7 @@ AUX calculate-lib-2.2.20-ini_ver.patch 8555 RMD160 ecfd91f26e456f5d445657caf08a2 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 AUX calculate-lib-2.2.21-r2.patch 1558 RMD160 cc4bc7084d446599bcd4e4c19e3e528ce884905e SHA1 0492353621909dcbc829ad0d891a133a29a01223 SHA256 fa7bd15788b9fa3e1827ce4d7ca5ac09468410f68b10b82342eb8ecebf0813ec +AUX calculate-lib-2.2.22-timezone.patch 1386 RMD160 ed4d65cfc4e338f00827235e624506d2cbabafac SHA1 b387c78fd247fb2bc29677323904b01b0b5a4fdc SHA256 52e082728df9bb18eedec4f9c709dc3e28cc2a00e171931ca0c7438176afe100 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 @@ -40,8 +41,9 @@ EBUILD calculate-lib-2.2.20.ebuild 666 RMD160 890df4d0d047196b4afa183a28f828835e EBUILD calculate-lib-2.2.21-r1.ebuild 803 RMD160 5b731301841711a4ee28e8ae4a9c04a3497382a7 SHA1 dab7d1f7308c04f1c82db49f5e1873620dc367d3 SHA256 e070d3ae1d6e2657bddefbb0543e9578275e21b028d635c34ecb5d94f7cd4693 EBUILD calculate-lib-2.2.21-r2.ebuild 803 RMD160 1f1a4645a38bc037c18e2bfd2eca1b3ed62dfb3d SHA1 a27f21912d1bbe9d2020c0d066f4a4e9b1402159 SHA256 5ff88d71e489fec872e898f054a54dbfb74e929b3e9ee2d7c25b9a00fc5eb548 EBUILD calculate-lib-2.2.21.ebuild 685 RMD160 43e6ab9361d04ac60f06819ac4f6a31ab452868a SHA1 f6d64ea2484b2eb610385824eebff0ebd54180ea SHA256 64c4353505d85dc3fedb46ef4b50cc27a546dcf549f9e7f3272b0554872c1460 +EBUILD calculate-lib-2.2.22-r1.ebuild 813 RMD160 d6b1d6b3416e0cc7c357fc152b5100605b6cc619 SHA1 dd7a9db0f410fce7435fec0efaf196957bc53ef4 SHA256 b8e267111d6456e4bfd31e31b79356d656d2e414b7bb8ce392ef263173698b45 EBUILD calculate-lib-2.2.22.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 25546 RMD160 14298f591585bcf6dbc105199623d153de161239 SHA1 1b7527d9726f82d6231d91ed8f7335a668683677 SHA256 948d30ab0142ee06f9489d58bccb2138544881fa5c441d5780f5590085c81b55 +MISC ChangeLog 25748 RMD160 d1c7e02865f59cf654430bc14fb5b2e8ae9c4db4 SHA1 7670dd038f32091292b706cda869f1c4493da2ec SHA256 03549f9569941351550f56834d73527213a177c0857849df73dd8987809d35bf MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec diff --git a/sys-apps/calculate-lib/calculate-lib-2.2.22-r1.ebuild b/sys-apps/calculate-lib/calculate-lib-2.2.22-r1.ebuild new file mode 100644 index 000000000..3c3a98773 --- /dev/null +++ b/sys-apps/calculate-lib/calculate-lib-2.2.22-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}" + + # add timezone variable + epatch "${FILESDIR}/calculate-lib-2.2.22-timezone.patch" +} diff --git a/sys-apps/calculate-lib/files/calculate-lib-2.2.22-timezone.patch b/sys-apps/calculate-lib/files/calculate-lib-2.2.22-timezone.patch new file mode 100644 index 000000000..468225341 --- /dev/null +++ b/sys-apps/calculate-lib/files/calculate-lib-2.2.22-timezone.patch @@ -0,0 +1,43 @@ +commit 3ca3bdbf08970e46f4f7b5996b49170a49cffc1a +Author: Mike Hiretsky +Date: Mon Aug 29 12:11:33 2011 +0400 + + Add os_clock_timezone variable for store current timezone. + +diff --git pym/cl_fill.py pym/cl_fill.py +index c2300b7..31bbc61 100644 +--- pym/cl_fill.py ++++ pym/cl_fill.py +@@ -715,3 +715,18 @@ class fillVars(varsShare): + def get_cl_ca_path(self): + """CA path""" + return '/var/calculate/ssl/main' ++ ++ def get_os_clock_timezone(self): ++ """Current clock timezone""" ++ zoneinfodir = "/usr/share/zoneinfo/" ++ localtimefile = "/etc/localtime" ++ timezonefile = "/etc/timezone" ++ # try get timezone from kernel calculate param ++ timezone = self.getValueFromCmdLine("calculate",2) ++ if timezone and \ ++ path.exists(path.join(zoneinfodir,timezone)): ++ return timezone ++ # get timezone from /etc/timezone ++ if path.exists(timezonefile): ++ return open(timezonefile,"r").read().strip() ++ return "UTC" +diff --git pym/cl_vars.py pym/cl_vars.py +index 3194ff8..0466cc5 100644 +--- pym/cl_vars.py ++++ pym/cl_vars.py +@@ -103,6 +103,9 @@ class Data: + # system (desktop or server) + os_linux_system = {'hide':True} + ++ # current timezone ++ os_clock_timezone = {'hide':True} ++ + # motherboard model + hr_board_model = {'hide':True} + diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index 419dc954d..9b69edf18 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.22-r2 (29 Aug 2011) + + 29 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.22-r2.ebuild: + Update for builder,install and lib. + *calculate-utilities-2.2.22-r1 (26 Aug 2011) 26 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 5dac43240..d75202a13 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -37,6 +37,7 @@ EBUILD calculate-utilities-2.2.21-r4.ebuild 877 RMD160 7e08a06ddbd0e1ca869a239ea EBUILD calculate-utilities-2.2.21-r5.ebuild 877 RMD160 09ce287938acafea4fa6fe56b2fc8fc2fab333a6 SHA1 e5e1e8d0c1359491e4f987e94e61b03f17f22295 SHA256 acd8bd887beefdf85dbd48099a7d9a5733891317e35c2c9911db2dd74fa3b5aa EBUILD calculate-utilities-2.2.21.ebuild 862 RMD160 3786826c24e6bfc0fb9e5b413c85e429ae412723 SHA1 8beb4139d5f2828421d57c4ab7ba6e8a2e59d9ef SHA256 530ea787bfee6bd4308bb782b82a42f0e60d02fa692877135f3fe8402c4ba677 EBUILD calculate-utilities-2.2.22-r1.ebuild 865 RMD160 5e07b982463d8770bcfd67bb8892cbeeb521936e SHA1 d25b976542a7748d34d564495862f8e979f88033 SHA256 d3f06aad167e9a4b10163605c050b99fa1303e9534cde13a33dde3efd649a1b7 +EBUILD calculate-utilities-2.2.22-r2.ebuild 874 RMD160 e33c33028cb6fb6b0711e1cc16b737de2146f150 SHA1 9b9c9e253283d2abd32c9951dfd00da7363b6818 SHA256 995034e2508108e6aa13e801494576f3d7cc6101edd3566b8c790ebf4c2f402a EBUILD calculate-utilities-2.2.22.ebuild 862 RMD160 e8bb89257a8475f8822893d62cb929753a9bdb20 SHA1 e2a5cd9b07aa215dea3d55cf4a3d7d1c81568403 SHA256 42e6179382cc058bf93136aa8df7b8ea98ec6164980626745b508182926f85f6 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 21308 RMD160 114e53519342bd522afed0af5446edf5bda0406c SHA1 1a9a92d843a4cf3a4860df1d55cc243451c418cf SHA256 4d4151435a6a41c9c6a5caebe288d6bef244a5d5ba3691871cc34131b581ae0d +MISC ChangeLog 21494 RMD160 85600396b0f1f659598808353c01026a31ffadb0 SHA1 23948d28adfaad1631bf705110bdf662ac42b71c SHA256 637f15205ff40ed589fbcf580a47e39259967a0bb925ab11c1084734859f38fe diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.22-r2.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.22-r2.ebuild new file mode 100644 index 000000000..433ee32f2 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.22-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.22-r1 + =sys-apps/calculate-templates-2.2.22-r1 + =sys-apps/calculate-lib-2.2.22-r1 + =sys-apps/calculate-i18n-2.2.22 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.22 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.22-r1 ) + cl_client? ( =sys-apps/calculate-client-2.2.22 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.22 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.22 ) + + cl_server? ( =sys-apps/calculate-server-2.1.14-r6 ) +" +