From 497dd046de3f755e1414be522c806e97478fa81c Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 23 May 2011 12:13:30 +0400 Subject: [PATCH] Fix calculate-lib. --- sys-apps/calculate-lib/ChangeLog | 7 ++++ sys-apps/calculate-lib/Manifest | 4 +- .../calculate-lib-2.2.15-r1.ebuild | 32 +++++++++++++++ ...lculate-lib-2.2.15-fix_get_from_xorg.patch | 39 +++++++++++++++++++ sys-apps/calculate-utilities/ChangeLog | 6 +++ sys-apps/calculate-utilities/Manifest | 3 +- .../calculate-utilities-2.2.15-r4.ebuild | 36 +++++++++++++++++ 7 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 sys-apps/calculate-lib/calculate-lib-2.2.15-r1.ebuild create mode 100644 sys-apps/calculate-lib/files/calculate-lib-2.2.15-fix_get_from_xorg.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.15-r4.ebuild diff --git a/sys-apps/calculate-lib/ChangeLog b/sys-apps/calculate-lib/ChangeLog index 77c873180..ef0071978 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.15-r1 (23 May 2011) + + 23 May 2011; Mike Hiretsky (mhiretskiy) + +calculate-lib-2.2.15-r1.ebuild, + +files/calculate-lib-2.2.15-fix_get_from_xorg.patch: + Update lib for bug fix. + *calculate-lib-2.2.15 (18 May 2011) 18 May 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest index 7cd7c2b49..44cd96390 100644 --- a/sys-apps/calculate-lib/Manifest +++ b/sys-apps/calculate-lib/Manifest @@ -1,6 +1,7 @@ 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.15-fix_get_from_xorg.patch 1781 RMD160 5ab65ae39abebcb114b3c7870b5a501ad3e24fce SHA1 288c51322988bd3d64ff7a01f7d77bac275cda78 SHA256 b90eb1cc093d4dfef43b38077fbb993b0bb92f75158ceaea1b768427d24915fc 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.8.tar.bz2 61178 RMD160 4a4ed063a9b4d3b82723f5f6eb046c97ad9fcda1 SHA1 93eb20057afff6e98c409388e1259a3ad078bb7a SHA256 ef8e315001663da7a45e69b82dc7c158fb0e10bd567efa95bf8a654ed441144a @@ -13,8 +14,9 @@ EBUILD calculate-lib-2.2.13.ebuild 620 RMD160 c6b655288e00b8225c87a7c0aee27df160 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.15-r1.ebuild 746 RMD160 5cb4e3ee379a8be31b3f44ec541964647d901661 SHA1 0b354f080225e876daf8d428c97d6f61eefb273c SHA256 5ec08bd26cb1699f439be732a95b34538ab56f239da045e10a69caf5f3c53369 EBUILD calculate-lib-2.2.15.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 20014 RMD160 880f8ce168d0f1668f3731a1d9c7711800ba237d SHA1 495ac5ab0cfe4b5904c79a0913d52f36065d6ad3 SHA256 2297c46b4e9d85279f17b72266da77dc08b3e833151456ebff74aee2dc185dad +MISC ChangeLog 20231 RMD160 bce8bd7eee6f69ecbbaa6d9361ae410056f0421e SHA1 e9946953fbf09330c0b8c4cffb12fb5512ad2cc7 SHA256 a17e1e42227b6fe58b98f2baf32116c33aa8e98eafd5ba772a0e531900413fbd MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec diff --git a/sys-apps/calculate-lib/calculate-lib-2.2.15-r1.ebuild b/sys-apps/calculate-lib/calculate-lib-2.2.15-r1.ebuild new file mode 100644 index 000000000..a442b8af6 --- /dev/null +++ b/sys-apps/calculate-lib/calculate-lib-2.2.15-r1.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="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}" + + # back port + epatch "${FILESDIR}/calculate-lib-2.2.15-fix_get_from_xorg.patch" +} + diff --git a/sys-apps/calculate-lib/files/calculate-lib-2.2.15-fix_get_from_xorg.patch b/sys-apps/calculate-lib/files/calculate-lib-2.2.15-fix_get_from_xorg.patch new file mode 100644 index 000000000..5c5df6f6d --- /dev/null +++ b/sys-apps/calculate-lib/files/calculate-lib-2.2.15-fix_get_from_xorg.patch @@ -0,0 +1,39 @@ +diff --git a/pym/cl_fill.py b/pym/cl_fill.py +index 172b861..bf45cb2 100644 +--- a/pym/cl_fill.py ++++ b/pym/cl_fill.py +@@ -440,7 +440,7 @@ class fillVars(varsShare): + matchSect = re.search(r'Section "Device".*?EndSection', + open('/etc/X11/xorg.conf').read(),re.S) + if matchSect: +- resDriver = re.search(r'Driver\s*"([^"]+)"', ++ resDriver = re.search(r'^\S*Driver\s*"([^"]+)"', + matchSect.group(0),re.S) + if resDriver and resDriver.group(1) in list_avialable_drivers: + return resDriver.group(1) +diff --git a/pym/cl_vars_share.py b/pym/cl_vars_share.py +index 316193c..961aa01 100644 +--- a/pym/cl_vars_share.py ++++ b/pym/cl_vars_share.py +@@ -358,16 +358,17 @@ class varsShare: + lineCompositeTmp = "" + lineComposite = "" + for line in confLines: ++ line = line.strip() + if flagStartExtensions: +- if 'EndSection' in line: ++ if line.startswith('EndSection'): + lineComposite = lineCompositeTmp + break +- elif 'Section' in line: ++ elif line.startswith('Section'): + break +- if 'Option' in line and '"Composite"' in line: ++ if line.startswith('Option') and '"Composite"' in line: + lineCompositeTmp = line + else: +- if '"Extensions"' in line and 'Section' in line: ++ if '"Extensions"' in line and line.startswith('Section'): + flagStartExtensions = True + if lineComposite: + listOpt = filter(lambda x: x.strip(), lineComposite.split('"')) diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index 412a35705..dd9c56264 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.15-r4 (23 May 2011) + + 23 May 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.15-r4.ebuild: + Update for lib. + *calculate-utilities-2.2.15-r3 (23 May 2011) 23 May 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index da975b85e..4de3717d5 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -14,6 +14,7 @@ EBUILD calculate-utilities-2.2.14.ebuild 829 RMD160 ca16f926dbac23f8a83595b70723 EBUILD calculate-utilities-2.2.15-r1.ebuild 832 RMD160 688a5ec9a4cb023e8ece8bf14a8bc7b18beccaaf SHA1 65cdc57f37474b8210b27df6f5d35ac59c24db7d SHA256 e6124e3bce16a5da7fa5ed5abfaa8a30c0eb259b554f645c66efdb19f54a0e7d EBUILD calculate-utilities-2.2.15-r2.ebuild 832 RMD160 cb65479ab3ab4ffcc582f2a86ceff5efee0e5b30 SHA1 e0ea10eb3d28c8a06937f90b419c975c6d14a463 SHA256 ab7e18c952928326e4bbfdf7998f8546c04f837a2434f672868b716775ac36db EBUILD calculate-utilities-2.2.15-r3.ebuild 835 RMD160 fdaed0dfa80627e09cd92df7757973e73748ac19 SHA1 861e875d5b3b7a69bc5e743180ece46af0a51a30 SHA256 c4f255a9c0e7b2a3c490f9bac66a89d4215281e79cbb1e38bd0e8e03ce7d88af +EBUILD calculate-utilities-2.2.15-r4.ebuild 838 RMD160 0ac5b0baa9591e32d3bc1fb83259a1af6f145ef3 SHA1 cb20981186bc64ac2164699e4e28cd63c121ff71 SHA256 3b6c1f777bac3ca53fea9a2441873ca79cd6241d135f9f9c5285a5f678ae2161 EBUILD calculate-utilities-2.2.15.ebuild 829 RMD160 08af4128804390a3611da9de6a0877f86f837c03 SHA1 d4c713a63a074a193a2a8a614ed80c5e343af871 SHA256 5e60616c449b464b7163a25c32f1dd5a565d5c878b823a23b2848fda49d0afca EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 9083 RMD160 eba9b677f1c375809d1d1f504fe4ebef3c4aef55 SHA1 05504c68a4dbdaa67f919a0e89bd4cda9b0d64bc SHA256 3fccea97e4b5924d8725232c01c4511f66eab2db041390e4227323a24ca71d37 +MISC ChangeLog 9249 RMD160 7024e11d15ab8c9aa9c9ec703821a210a5242238 SHA1 f8007a19616e20cf4a913ac9d170673ee564a4eb SHA256 cb333ec0c3ab1f739672d16566dadd9673c3bef9d043b142d681e8306897c9db diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.15-r4.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.15-r4.ebuild new file mode 100644 index 000000000..29c7f1e4a --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.15-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.15-r1 + =sys-apps/calculate-templates-2.2.15-r1 + =sys-apps/calculate-lib-2.2.15-r1 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.15 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.15 ) + cl_client? ( =sys-apps/calculate-client-2.2.15 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.15 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.15 ) + + cl_server? ( =sys-apps/calculate-server-2.1.13-r3 ) +" +