diff --git a/sys-apps/calculate-lib/ChangeLog b/sys-apps/calculate-lib/ChangeLog index d3dbd4d11..088e4f5d9 100644 --- a/sys-apps/calculate-lib/ChangeLog +++ b/sys-apps/calculate-lib/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-lib-2.2.17-r2 (24 Jun 2011) + + 24 Jun 2011; Mike Hiretsky (mhiretskiy) + +calculate-lib-2.2.17-r2.ebuild, + +files/calculate-lib-2.2.17-fix_videodetect.patch: + Update for bugfix. + *calculate-lib-2.2.17-r1 (23 Jun 2011) 23 Jun 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest index c7e0ef17a..2ade27109 100644 --- a/sys-apps/calculate-lib/Manifest +++ b/sys-apps/calculate-lib/Manifest @@ -3,6 +3,7 @@ AUX calculate-lib-2.2.15-fix_get_from_xorg.patch 1781 RMD160 5ab65ae39abebcb114b AUX calculate-lib-2.2.15-fix_update_config.patch 1072 RMD160 74541ac312602b2d314da5412524f4191c86e3ad SHA1 3d0c9bbe2d99c9d8783fae628136fbe52217a6ab SHA256 634dc581d1728beb021ee805053625c7908180355b62a5e31f4579cffce2c530 AUX calculate-lib-2.2.16-fix_get_uid.patch 1624 RMD160 4f9bc24d1f2e99ab929399a3fedca273f28f1956 SHA1 d17822f1b29f0e5254c6d9207a919f5ec3695e98 SHA256 833a6e4da7ddd2ad431ebf1cfd4acb6aeae2b6571f1e00b7e74df9310250e286 AUX calculate-lib-2.2.17-backport.patch 2553 RMD160 a59dda5e1566e53a021474a52dfbb4f54516d7a5 SHA1 25fd7e130dc62b29a8125cf7f2c477f68f1b7898 SHA256 7444f2bc297dd12d4b9cadd5281286550cff19adcbc362e66c027c57b5a8202d +AUX calculate-lib-2.2.17-fix_videodetect.patch 1176 RMD160 bb8def2761f2a533f5b49f38b3618a93dcfface2 SHA1 b7b14f4739af07dccc75261b95f83482bbcc4506 SHA256 54adaee609cde4a812761b4641ab3ed10c18d0adb37f3879a7b8515805a1a5e3 AUX calculate-lib-2.2.8-file.patch 747 RMD160 8a1f90c822eaefac69b67aa6999a1dc8c2b51b9f SHA1 aeded1b0587785145f4e62f3e81a2726e7c4312d SHA256 45ce03a248d8bec22bbdf006ce607809761304d255467e687242f9423c8413a4 AUX lib_i18n_path.patch 1114 RMD160 6e561c46e91105f4e7686678771da21e8f3685a2 SHA1 b58e8906104b4b9d1a1bd8ecb6959767cad2d329 SHA256 2913821d3c069612485e6dd7fb0e71bc06e5061054309ad9ed6bac29eee732f2 DIST calculate-lib-2.1.11.tar.bz2 61687 RMD160 93ca4f84ff2cd7018addfd4de162959d78e51f78 SHA1 53149951c346fea7709cb43b4d8ebefe63acb0fd SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 @@ -19,8 +20,9 @@ EBUILD calculate-lib-2.2.15.ebuild 620 RMD160 c6b655288e00b8225c87a7c0aee27df160 EBUILD calculate-lib-2.2.16-r1.ebuild 768 RMD160 4312332a4e8dcba397e40a469dd6d2f50246c1b6 SHA1 67ca7c5877154f05cd0189d113bded9925dceecf SHA256 c7f1967046c6efd62360be848fe6e88edfb425c1d1ed8057c33f9f7eae83510c EBUILD calculate-lib-2.2.16.ebuild 620 RMD160 c6b655288e00b8225c87a7c0aee27df1602978bf SHA1 8effba1ef6dec2caf6c75162ced40d8d9c571702 SHA256 733ddccc79c4df5fac82a50a8c94b1494033ed7fb89f4df6ec95d5e8e10ab1d7 EBUILD calculate-lib-2.2.17-r1.ebuild 744 RMD160 86da0ffbf03134fe70ee9d80d9af87156d310bca SHA1 f278e62476d4b3fc1600e8b29916aa755d869a94 SHA256 4c224e947dece22065ed65d8ff7d2fe01a9da6a5e06ddb3cc9f68faa043e33b1 +EBUILD calculate-lib-2.2.17-r2.ebuild 840 RMD160 ed12ca418bce8b0237ebe6d3b46709629a22fa7a SHA1 8f063ff4f43548c886ada89d9bbf9d3da92fad48 SHA256 54f4cfd0660e2c528745c9f0bfa1ba566508356c22b3296b6c6ea760ecb3c92a EBUILD calculate-lib-2.2.17.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 21306 RMD160 94cee749c8a20532c79d45d7a4584df8616c5dc3 SHA1 79c93d608a5b7178afce70780b4002a8abd94f07 SHA256 d53ffd6e9011e3929156c2fa4f2d5e76878c0dcedbf0a8d947ff31141fadb578 +MISC ChangeLog 21516 RMD160 dd831831d3d9bf986f69fec77bbdc0322c00fd12 SHA1 b13d337a53fca76b04d7f38ec14bf9c137b0c644 SHA256 eb74e1b26ce4a528d6d862e543038d77af977012793824c6d41495f9c6e5c6ce MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec diff --git a/sys-apps/calculate-lib/calculate-lib-2.2.17-r2.ebuild b/sys-apps/calculate-lib/calculate-lib-2.2.17-r2.ebuild new file mode 100644 index 000000000..d56720046 --- /dev/null +++ b/sys-apps/calculate-lib/calculate-lib-2.2.17-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit distutils eutils + +SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2" + +DESCRIPTION="The 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/file[python]" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # add some features + epatch "${FILESDIR}/calculate-lib-2.2.17-backport.patch" + # fix x11 video driver detect + epatch "${FILESDIR}/calculate-lib-2.2.17-fix_videodetect.patch" +} diff --git a/sys-apps/calculate-lib/files/calculate-lib-2.2.17-fix_videodetect.patch b/sys-apps/calculate-lib/files/calculate-lib-2.2.17-fix_videodetect.patch new file mode 100644 index 000000000..2e2b8260e --- /dev/null +++ b/sys-apps/calculate-lib/files/calculate-lib-2.2.17-fix_videodetect.patch @@ -0,0 +1,29 @@ +commit d22ba198c61eccec92c1ec1309380fba19757c23 +Author: Mike Hiretsky +Date: Fri Jun 24 10:49:36 2011 +0400 + + Remove from available X11 drivers drivers in /usr/portage/distfiles. + +diff --git a/pym/cl_utils.py b/pym/cl_utils.py +index 24760c9..025b051 100644 +--- a/pym/cl_utils.py ++++ b/pym/cl_utils.py +@@ -967,16 +967,10 @@ def getSquashList(): + + def getAvailableX11Drivers(prefix="/"): + """Get available x11 drivers""" +- distfiles = path.join(prefix,'usr/portage/distfiles') + xorg_modules_dir = path.join(prefix,'usr/lib/xorg/modules/drivers') +- return list(set( +- map(lambda x:'fglrx' if x.startswith('ati-driver') else "nvidia", +- filter(lambda x:x.startswith('ati-driver-installer') or +- x.startswith('NVIDIA-Linux'), +- listDirectory(distfiles))) + \ +- map(lambda x: x[:-7], ++ return map(lambda x: x[:-7], + filter(lambda x:x.endswith('_drv.so'), +- listDirectory(xorg_modules_dir))))) ++ listDirectory(xorg_modules_dir))) + + def lspci(filtername=None,shortInfo=False): + """Get hash of lspci, filtred by filtername. If shortInfo, then diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index 70906ec3f..e74359c7b 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.17-r4 (24 Jun 2011) + + 24 Jun 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.17-r4.ebuild: + Update for lib + *calculate-utilities-2.2.17-r3 (24 Jun 2011) 24 Jun 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 72e5e7b94..3f2608be9 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -19,6 +19,7 @@ EBUILD calculate-utilities-2.2.16.ebuild 829 RMD160 dee34889a7f8ab23011ca5768557 EBUILD calculate-utilities-2.2.17-r1.ebuild 838 RMD160 730c47dc92b94fb5d654ea0519619595814eb823 SHA1 e4295b0baf7b7415d98217f41e077ae272904889 SHA256 b011892b1f94debc03abf616965018b56a4ed9adf8b2b3849ce10ea18c412ec9 EBUILD calculate-utilities-2.2.17-r2.ebuild 838 RMD160 77c6a1fe6fe2a5362c5d687d4bf9d6ae4ba55640 SHA1 90dc1b30046b1207424b969140f3d8659f2298c8 SHA256 bfb285120cd0df0cad0283c2fab7d5b26148f207d2a8e4a2a63becc8a4c84b60 EBUILD calculate-utilities-2.2.17-r3.ebuild 838 RMD160 41fda29d1dedca885073afba581ccefd3984f398 SHA1 6985b9720b7957900d7048d67334e9c804d873a8 SHA256 7a27dee7d29e940f8d0c2c87f0c4553771c120afa672ca40fde9b0da38cd1504 +EBUILD calculate-utilities-2.2.17-r4.ebuild 838 RMD160 50ebe6b7429697cb961f398ce26b06bd36d76d56 SHA1 f1772a64f1fd35cd7f7d0441eb00e7d5b0b9e8ef SHA256 6eacc7fb52b06b241b5c389eea3f78644bf041f27951d9fa05317873f3745822 EBUILD calculate-utilities-2.2.17.ebuild 829 RMD160 29fb0a089833990a144d2f31cad389d4feaad2a6 SHA1 a2a0a45be11ccbb49772f0bc04dc0be2c68ea361 SHA256 0f96a85ef7e239058d62387237df40e3ba19e310e963226398d91413967a60b3 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 12560 RMD160 87325f2227bdd96560c90ee5c216c51e2f13b38d SHA1 d9655f2e97cd4f797d7b93bb105a2b6a18f95731 SHA256 9ffc64f86ae7fb04cda74b438fd028f0db9898e1f424b5e9191c11e231f6a6d1 +MISC ChangeLog 12725 RMD160 98451e60c850af402e6d3c41f5b477da058a4f37 SHA1 9f76913e4cf4eeaaaa25c0351371f97db4cab715 SHA256 0ccc5341081e5d26d8a98ce088b4acf54bf35f9d795143e69bdd5e4d775253f8 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.17-r4.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.17-r4.ebuild new file mode 100644 index 000000000..4a88a19ca --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.17-r4.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 + +DESCRIPTION="Calculate Utilities meta package" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +SRC_URI="" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE=" +cl_assemble +cl_builder +cl_client +cl_desktop +cl_installgui +cl_server +" + +RDEPEND="${RDEPEND} + =sys-apps/calculate-install-2.2.17-r1 + =sys-apps/calculate-templates-2.2.17-r3 + =sys-apps/calculate-lib-2.2.17-r2 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.17 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.17 ) + cl_client? ( =sys-apps/calculate-client-2.2.17 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.17 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.17 ) + + cl_server? ( =sys-apps/calculate-server-2.1.14-r2 ) +" +