New ebuild unoconv-0.4-r1.ebuild + fix for python 2.7 that throws

if LD_LIBRARY_PATH is empty.

4 files changed, 64 insertions, 1 deletions

diff --git a/app-office/unoconv/ChangeLog b/app-office/unoconv/ChangeLog
index 6d02ba8..d3a0f43 100644
--- a/app-office/unoconv/ChangeLog
+++ b/app-office/unoconv/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*unoconv-0.4-r1 (17 May 2011)
+
+  17 May 2011; Sven Eden <sven.eden@gmx.de> +unoconv-0.4-r1.ebuild: New
+  version adding a patch to fix a KeyError exception with Python 2.7
+  if LD_LIBRARY_PATH is empty.
+
 *unoconv-0.4 (27 Mar 2011)
 
   27 Mar 2011; Sven Eden <sven.eden@gmx.de> +unoconv-0.4.ebuild : Initial
diff --git a/app-office/unoconv/Manifest b/app-office/unoconv/Manifest
index 415a1aa..c2dc8a4 100644
--- a/app-office/unoconv/Manifest
+++ b/app-office/unoconv/Manifest
@@ -1,4 +1,7 @@
+AUX fix_empty_ld_path.patch 1056 RMD160 1b9cd977334f5b7b2518939e1b53d14e4eb867e4 SHA1 3cf8f951a0e14c6bd307aed8d8f8a57d5ec4716e SHA256 45680b423590804667a40c610c2adc8abda6429d854997c1e2aa914b72a21104
 DIST unoconv-0.4.tar.bz2 64802 RMD160 cf53514edbdc12ec0d1fb98272323f908e96b906 SHA1 362168001f4653e495ee01d1235ef1a30307ac2f SHA256 29aad1d158989d7c9776a437495a3d67988dbcc0102aa96bcf8b2a9468455d2c
+EBUILD unoconv-0.4-r1.ebuild 760 RMD160 bf4e150d7ae24d581fd857e1ba091e71674b0213 SHA1 598bfd949b97a8f551b6fe3d3dc2daf54eade395 SHA256 ee7f7dc181c64c7ab451b217b03c1e6eb08340b2606a0f400cf3b636c0ff4036
 EBUILD unoconv-0.4.ebuild 695 RMD160 e655017a2bd566580c99239c7ac63982744af170 SHA1 27911e787305ef9c6fb5f941be2f64e9189771fb SHA256 74298ce9652f60129d09d18d864100b58e30250cde73b775a115ac99ff027068
-MISC ChangeLog 250 RMD160 5ea2e13349ad394739db11ebf03bf0c49831a8c9 SHA1 23653028cc45f032fa7110009d38094528f675d5 SHA256 22b45490a88bd9a83bd8a9d0f69931e697adcae9aa002bc1c7ba7512fa2c3234
+MISC ChangeLog 454 RMD160 ac724545ea3aa7d62a1b64cd707162e15c760bf6 SHA1 53c507f26ddc95df4dc234ed10af193962c83750 SHA256 360cc4fa4ea3b08159969279afe83264dcbd1327826f4be8dea6e095caee43f4
+MISC ChangeLog~ 250 RMD160 5ea2e13349ad394739db11ebf03bf0c49831a8c9 SHA1 23653028cc45f032fa7110009d38094528f675d5 SHA256 22b45490a88bd9a83bd8a9d0f69931e697adcae9aa002bc1c7ba7512fa2c3234
 MISC metadata.xml 696 RMD160 eefee5a91f449b16d3cbfdcbb453bf47e5a7b25b SHA1 5873b8e2863157effacdb823d69c63dd576c1105 SHA256 957d52534fbae4f869ed4443c46dc06a14f8474c0a294c7c878a5355b9e48e90
diff --git a/app-office/unoconv/files/fix_empty_ld_path.patch b/app-office/unoconv/files/fix_empty_ld_path.patch
new file mode 100644
index 0000000..5d47e60
--- /dev/null
+++ b/app-office/unoconv/files/fix_empty_ld_path.patch
@@ -0,0 +1,22 @@
+--- unoconv	2010-10-20 11:56:26.000000000 +0200
++++ unoconv	2011-05-17 21:14:38.395241116 +0200
+@@ -64,7 +64,18 @@
+             sys.path.append(oolibpath)
+             import uno, unohelper
+             ### Export an environment that OpenOffice is pleased to work with
+-            os.environ['LD_LIBRARY_PATH'] = oolibpath + os.pathsep + os.environ['LD_LIBRARY_PATH']
++
++            # Added Wrapper for unset LD_LIBRARY_PATH
++            if 'LD_LIBRARY_PATH' in os.environ:
++                lib_path = os.environ['LD_LIBRARY_PATH']
++                if oolibpath in lib_path:
++                    pass
++                else:
++                    os.environ['LD_LIBRARY_PATH'] += os.pathsep + oolibpath
++            else:
++                os.environ['LD_LIBRARY_PATH'] = oolibpath
++            # This old line fails with python 2.7, the above should work with 2.x
++            # os.environ['LD_LIBRARY_PATH'] = oolibpath + os.pathsep + os.environ['LD_LIBRARY_PATH']
+             break
+         except ImportError, e:
+             sys.path.remove(oolibpath)
diff --git a/app-office/unoconv/unoconv-0.4-r1.ebuild b/app-office/unoconv/unoconv-0.4-r1.ebuild
new file mode 100644
index 0000000..279db4c
--- /dev/null
+++ b/app-office/unoconv/unoconv-0.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Convert between any document format supported by OpenOffice"
+HOMEPAGE="http://dag.wieers.com/home-made/unoconv/"
+SRC_URI="http://dag.wieers.com/home-made/unoconv/${P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+SLOT="0"
+
+RDEPEND=">=dev-lang/python-2.5
+	 || ( app-office/openoffice app-office/openoffice-bin )"
+DEPEND="dev-python/setuptools
+        >=app-text/asciidoc-8.2.6"
+
+src_prepare() {
+	epatch "${FILESDIR}/fix_empty_ld_path.patch"
+}
+
+src_install() {
+	emake docs DESTDIR="${D}"
+	emake docs-install DESTDIR="${D}"
+	emake install DESTDIR="${D}"
+	emake install-links DESTDIR="${D}"
+}