Исправление утилит 2.2.32 для совместимости с sys-apps/file-5.19

sys-apps/calculate-lib/calculate-lib-2.2.32-r4.ebuild

@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=(python2_7)
+
+inherit distutils-r1 eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/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/iproute2
+	sys-apps/pciutils
+	sys-fs/lvm2
+	sys-fs/mdadm
+	sys-apps/file[python]"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# create revision for calculate lib
+	epatch "${FILESDIR}/calculate-lib-2.2.32-r2.patch"
+
+	# fix for compabitble with file-5.19
+	epatch "${FILESDIR}/calculate-lib-2.2.32-fix_file.patch"
+}

sys-apps/calculate-lib/files/calculate-lib-2.2.32-fix_file.patch

@@ -0,0 +1,19 @@
+diff --git pym/cl_utils.py pym/cl_utils.py
+index cd2acc5..5c6a199 100644
+--- pym/cl_utils.py
++++ pym/cl_utils.py
+@@ -124,7 +124,13 @@ class typeFile:
+ 
+     def getMType(self, filename):
+         """Информация о типе файла"""
+-        ret = self.magicObject.file(filename)
++        try:
++            ret = self.magicObject.file(filename)
++        except UnicodeDecodeError:
++            try:
++                ret = self.magicObject.file(filename.decode('utf-8'))
++            except UnicodeDecodeError:
++                return None
+         # fix for kernel 3.7.7 (bad work samba with big files)
+         if ret is None and self.magicObject.errno() == 5:
+             r,w = os.pipe()

sys-apps/calculate-utilities/calculate-utilities-2.2.32-r11.ebuild

@@ -0,0 +1,30 @@
+# Copyright 1999-2012 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_server
+"
+
+RDEPEND="${RDEPEND}
+	!sys-apps/calculate-templates
+	!<sys-apps/calculate-install-3.0.0_alpha1
+	=sys-apps/calculate-lib-2.2.32-r4
+	=sys-apps/calculate-i18n-2.2.32
+
+	cl_assemble? ( =sys-apps/calculate-assemble-2.2.32-r3 )
+	cl_builder? ( =sys-apps/calculate-builder-2.2.32-r6 )
+
+	cl_server? ( =sys-apps/calculate-server-2.1.16-r15 )
+"