parent
875565261a
commit
497dd046de
@ -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="!<sys-apps/calculate-lib-2.1.8-r1
|
||||
!=sys-apps/calculate-lib-2.1.9
|
||||
!=sys-apps/calculate-lib-2.1.10
|
||||
!minimal? ( dev-python/py-smbpasswd )
|
||||
>=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"
|
||||
}
|
||||
|
||||
@ -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('"'))
|
||||
@ -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 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue