summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>2011-08-12 23:58:53 +0000
committerNathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>2011-08-12 23:58:53 +0000
commit9fb2f48d2b697e907e6709242f2c7282586e261f (patch)
tree8b0b50538e84ec0189a446ed1089d982e02a4937 /app-office
parentx11-libs/pdcurses: Dependency x11-libs/Xaw3d renamed to x11-libs/libXaw3d. (diff)
downloadsunrise-9fb2f48d2b697e907e6709242f2c7282586e261f.tar.gz
sunrise-9fb2f48d2b697e907e6709242f2c7282586e261f.tar.bz2
sunrise-9fb2f48d2b697e907e6709242f2c7282586e261f.zip
app-office/unoconv: Add libreoffice support.
(Portage version: 2.2.0_alpha49-r1/svn/Linux x86_64) svn path=/sunrise/; revision=12324
Diffstat (limited to 'app-office')
-rw-r--r--app-office/unoconv/ChangeLog9
-rw-r--r--app-office/unoconv/files/unoconv-0.3-openoffice-3.2-libreoffice.patch11
-rw-r--r--app-office/unoconv/files/unoconv-0.3-openoffice-3.2.patch11
-rw-r--r--app-office/unoconv/unoconv-0.3-r4.ebuild (renamed from app-office/unoconv/unoconv-0.3-r3.ebuild)7
4 files changed, 23 insertions, 15 deletions
diff --git a/app-office/unoconv/ChangeLog b/app-office/unoconv/ChangeLog
index a2dbbb6eb..2e02f91ce 100644
--- a/app-office/unoconv/ChangeLog
+++ b/app-office/unoconv/ChangeLog
@@ -1,7 +1,14 @@
# ChangeLog for app-office/unoconv
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*unoconv-0.3-r4 (12 Aug 2011)
+
+ 12 Aug 2011; Nathan Phillip Brink <binki@gentoo.org> -unoconv-0.3-r3.ebuild,
+ +unoconv-0.3-r4.ebuild, +files/unoconv-0.3-openoffice-3.2-libreoffice.patch,
+ files/unoconv-0.3-openoffice-3.2.patch:
+ Add libreoffice support.
+
01 Dec 2010; Fabiano Francesconi (elbryan) <fabiano.francesconi@gmail.com>
+unoconv-0.3-r3.ebuild, +files/unoconv-0.3-longer-timeout.patch,
+files/unoconv-0.3-openoffice-3.2.patch, +files/unoconv-wrapper,
diff --git a/app-office/unoconv/files/unoconv-0.3-openoffice-3.2-libreoffice.patch b/app-office/unoconv/files/unoconv-0.3-openoffice-3.2-libreoffice.patch
new file mode 100644
index 000000000..6f45690b4
--- /dev/null
+++ b/app-office/unoconv/files/unoconv-0.3-openoffice-3.2-libreoffice.patch
@@ -0,0 +1,11 @@
+--- a/unoconv
++++ b/unoconv
+@@ -17,7 +17,7 @@
+ import getopt, sys, os, glob, time
+
+ #extrapaths = ('/usr/lib/openoffice/program/', '/usr/lib/openoffice.org2.0/program/')
+-extrapaths = glob.glob('/usr/lib*/openoffice*/program/') + glob.glob('/usr/lib*/ooo*/program') + [ '/Applications/NeoOffice.app/Contents/program', ]
++extrapaths = glob.glob('/usr/lib*/libreoffice*/basis*/program/') + glob.glob('/usr/lib*/openoffice*/basis*/program/') + glob.glob('/usr/lib*/openoffice*/program/') + glob.glob('/usr/lib*/ooo*/program') + [ '/Applications/NeoOffice.app/Contents/program', ]
+ for path in extrapaths:
+ try:
+ sys.path.append(path)
diff --git a/app-office/unoconv/files/unoconv-0.3-openoffice-3.2.patch b/app-office/unoconv/files/unoconv-0.3-openoffice-3.2.patch
index c45ae6c88..e69de29bb 100644
--- a/app-office/unoconv/files/unoconv-0.3-openoffice-3.2.patch
+++ b/app-office/unoconv/files/unoconv-0.3-openoffice-3.2.patch
@@ -1,11 +0,0 @@
---- unoconv.~1~ 2007-09-01 03:23:13.000000000 +0200
-+++ unoconv 2010-04-03 12:09:13.703092418 +0200
-@@ -17,7 +17,7 @@
- import getopt, sys, os, glob, time
-
- #extrapaths = ('/usr/lib/openoffice/program/', '/usr/lib/openoffice.org2.0/program/')
--extrapaths = glob.glob('/usr/lib*/openoffice*/program/') + glob.glob('/usr/lib*/ooo*/program') + [ '/Applications/NeoOffice.app/Contents/program', ]
-+extrapaths = glob.glob('/usr/lib*/openoffice*/basis*/program/') + glob.glob('/usr/lib*/openoffice*/program/') + glob.glob('/usr/lib*/ooo*/program') + [ '/Applications/NeoOffice.app/Contents/program', ]
- for path in extrapaths:
- try:
- sys.path.append(path)
diff --git a/app-office/unoconv/unoconv-0.3-r3.ebuild b/app-office/unoconv/unoconv-0.3-r4.ebuild
index 8947e0136..2a1a2881e 100644
--- a/app-office/unoconv/unoconv-0.3-r3.ebuild
+++ b/app-office/unoconv/unoconv-0.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -16,10 +16,11 @@ IUSE=""
DEPEND="app-text/asciidoc
dev-python/setuptools"
-RDEPEND="|| ( app-office/openoffice app-office/openoffice-bin )"
+RDEPEND="|| ( app-office/openoffice app-office/openoffice-bin
+ app-office/libreoffice app-office/libreoffice-bin )"
src_prepare() {
- epatch "${FILESDIR}/${P}-openoffice-3.2.patch" \
+ epatch "${FILESDIR}/${P}-openoffice-3.2-libreoffice.patch" \
"${FILESDIR}/${P}-longer-timeout.patch"
}