app-office/unoconv: Add libreoffice support.

(Portage version: 2.2.0_alpha49-r1/svn/Linux x86_64)

svn path=/sunrise/; revision=12324

diff --git a/app-office/unoconv/ChangeLog b/app-office/unoconv/ChangeLog
index a2dbbb6ebf9050761c3c8eded71da611a7d40cb6..2e02f91ce47ce60fcfaa2fe85928116793340a5b 100644 (file)
--- 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 (file)
index 0000000..6f45690
--- /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 c45ae6c8816fcfc9db9f7513ee8731b9a16f828e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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
similarity index 73%
rename from app-office/unoconv/unoconv-0.3-r3.ebuild
rename to app-office/unoconv/unoconv-0.3-r4.ebuild
index 8947e0136fff1dc9a58f69a5a4b3d06fcf4e2ad0..2a1a2881ea3b0de743c925b3ed1735319c8ae62d 100644 (file)
--- 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"
 }