[gentoo-commits] dev/graaff:master commit in: app-office/unoconv/files/, app-office/unoconv/

[Hans de Graaff]

commit:     e51ed5faa5557b90c7dfbb6df5758ed08453ebbb
Author:     Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Sun May 27 08:08:40 2012 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun May 27 08:08:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/graaff.git;a=commit;h=e51ed5fa

Newer version is available in the gentoo tree.

---
 app-office/unoconv/ChangeLog                       |   38 -------------------
 app-office/unoconv/Manifest                        |   22 -----------
 .../unoconv/files/unoconv-0.3-longer-timeout.patch |   11 -----
 .../unoconv/files/unoconv-0.3-openoffice-3.2.patch |   11 -----
 .../files/unoconv-0.4-empty-ld-library-path.patch  |   15 -------
 .../unoconv/files/unoconv-0.4-libreoffice.patch    |   20 ----------
 app-office/unoconv/metadata.xml                    |    6 ---
 app-office/unoconv/unoconv-0.3-r2.ebuild           |   28 --------------
 app-office/unoconv/unoconv-0.4-r1.ebuild           |   39 -------------------
 app-office/unoconv/unoconv-0.4-r2.ebuild           |   40 --------------------
 app-office/unoconv/unoconv-0.4.ebuild              |   35 -----------------
 11 files changed, 0 insertions(+), 265 deletions(-)

diff --git a/app-office/unoconv/ChangeLog b/app-office/unoconv/ChangeLog
deleted file mode 100644
index 99f62e1..0000000
--- a/app-office/unoconv/ChangeLog
+++ /dev/null
@@ -1,38 +0,0 @@
-# ChangeLog for app-office/unoconv
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*unoconv-0.4-r2 (27 Apr 2011)
-
-  27 Apr 2011; Hans de Graaff <graaff@g.o> +unoconv-0.4-r2.ebuild,
-  +files/unoconv-0.4-libreoffice.patch:
-  Add patch to work with libreoffice also.
-
-*unoconv-0.4-r1 (13 Dec 2010)
-
-  13 Dec 2010; Hans de Graaff <graaff@g.o> +unoconv-0.4-r1.ebuild,
-  +files/unoconv-0.4-empty-ld-library-path.patch:
-  Fix case where LD_LIBRARY_PATH is empty.
-
-*unoconv-0.4 (10 Dec 2010)
-
-  10 Dec 2010; Hans de Graaff <graaff@g.o> +unoconv-0.4.ebuild:
-  Version bump.
-
-  10 Dec 2010; Hans de Graaff <graaff@g.o> -unoconv-0.3.ebuild,
-  -unoconv-0.3-r1.ebuild, files/unoconv-0.3-longer-timeout.patch,
-  files/unoconv-0.3-openoffice-3.2.patch, metadata.xml:
-  Remove old versions.
-
-*unoconv-0.3-r2 (08 Apr 2010)
-
-  08 Apr 2010; Hans de Graaff <graaff@g.o> +unoconv-0.3-r2.ebuild,
-  +files/unoconv-0.3-longer-timeout.patch:
-  Add additional patch to allow longer timeout for OpenOffice to start up.
-
-*unoconv-0.3-r1 (03 Apr 2010)
-
-  03 Apr 2010; Hans de Graaff <graaff@g.o> +unoconv-0.3-r1.ebuild,
-  +files/unoconv-0.3-openoffice-3.2.patch:
-  Add support for Openoffice 3.2.
-

diff --git a/app-office/unoconv/Manifest b/app-office/unoconv/Manifest
deleted file mode 100644
index cf486fa..0000000
--- a/app-office/unoconv/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX unoconv-0.3-longer-timeout.patch 554 RMD160 b8007fa78904c8b1495e6e3e202d69bd3c8a43d5 SHA1 2dff02b6348328bdcccd47a6c6c88273b36ccf8f SHA256 44635640d248ff98c2254a5740a74842ebc0e3a83835639e50d3698e4b298f8e
-AUX unoconv-0.3-openoffice-3.2.patch 665 RMD160 e20615496ce3af64ffa2a79e6bdc0e734c093876 SHA1 f85e62b5fa2003ae7f410e4229265a3b79dd29b8 SHA256 564abdb8a08a4bd5332bde9e6eed8ba1d5b064a93136af9949f124a2ad0a9901
-AUX unoconv-0.4-empty-ld-library-path.patch 735 RMD160 21a453087d5892c73db44431401c6b32e66041f6 SHA1 5ca85d22aed258675c0223d923c048406e8c8f35 SHA256 9278004e2be067506860e294655667135abb12cdba4cca9df6d3ef08e48d31da
-AUX unoconv-0.4-libreoffice.patch 839 RMD160 6be0fca3549a70fc5cef23896f4244e74def855b SHA1 59864e2d53e2dda79a459bf83804546770fd1405 SHA256 8ae3d1dea7d562a85e9edaf6b35e4bfb3752b81c9f8c097a29c9063dd39f5939
-DIST unoconv-0.3.tar.bz2 59623 RMD160 6d3eaac9adcedfa492fb6d15d708e9d96d02e18d SHA1 7e4f5fee9075bec05175a773273506baf9b6c191 SHA256 6e1d0701ce6cedb2b21a1b2945f4f774500c4a10cf9d20a718e7a520f4549051
-DIST unoconv-0.4.tar.bz2 64802 RMD160 cf53514edbdc12ec0d1fb98272323f908e96b906 SHA1 362168001f4653e495ee01d1235ef1a30307ac2f SHA256 29aad1d158989d7c9776a437495a3d67988dbcc0102aa96bcf8b2a9468455d2c
-EBUILD unoconv-0.3-r2.ebuild 776 RMD160 e30c318ae2e8dfc8f12e999913570a48a88961c6 SHA1 cde6a9c801d398ff4d7ce3eba23e14608b5c7ab5 SHA256 f83c6be7ad45e1add9de898065c53d37ab61a0fdf402643fa529d63810b507e6
-EBUILD unoconv-0.4-r1.ebuild 911 RMD160 cef663b56a068cad9a943650d1fc28cbaebb81a1 SHA1 9f1f3ac655dd75b6a1367e24b5a87b888215f3f4 SHA256 c7f3e3bd0474e1d162f447c28161448ecc5a742181bb0977e806bedd0cda8cae
-EBUILD unoconv-0.4-r2.ebuild 1006 RMD160 3c9cd7f73bd6995a96a81b2e5bcf8f85c053049c SHA1 6cfa0f8fa43d376b6d3db23859ccbb79f386f73a SHA256 7abe29f76cd451f68addb7f77d79dd8f18723883ad2881963f5f6fbedf82a081
-EBUILD unoconv-0.4.ebuild 837 RMD160 70152f071a2bb57fdb408d3dbabf637c54e97c2f SHA1 aefcf29d91b731889095c55a491804cb5456dab3 SHA256 8e94509a9548187b420c2df46f931f95d72878e7fa256257961cff5adfaa54ad
-MISC ChangeLog 1247 RMD160 ddb92005030a35d420a1af3aa757cf5c6a84900d SHA1 7a2881f822693fcebd897b679c550f2f96b98e85 SHA256 a2e6b52d6b632f0fec4526e3dbc45058771458b24bf056c4fdfbd066c311701b
-MISC metadata.xml 222 RMD160 c395116c51764efaa671a0f89a7d8992ecbe7304 SHA1 2095e0ced2657346964271e45cc69027b0ccd49d SHA256 0adb6b2a2a8cc78f3d28b8b629db9d9e5731f21da86168ae88eeadc8b82d3225
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk239Y8ACgkQrnu0mw69JkrAZQEAjoxg1etmlf7oNl3hAf/MDp5Y
-hPr1c72r6OVd311whAQA/j43lWa4D/9zMcD4QoFgF4w5agiUKlbwA6CoMnpn6qMo
-=TF1a
------END PGP SIGNATURE-----

diff --git a/app-office/unoconv/files/unoconv-0.3-longer-timeout.patch b/app-office/unoconv/files/unoconv-0.3-longer-timeout.patch
deleted file mode 100644
index 6f0cd2e..0000000
--- a/app-office/unoconv/files/unoconv-0.3-longer-timeout.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- unoconv.~1~	2010-04-08 17:05:44.000000000 +0200
-+++ unoconv	2010-04-08 17:09:15.000000000 +0200
-@@ -375,7 +375,7 @@
-                 error(2, "Trying to launch our own listener using %s." % bin)
-                 try:
-                     oopid = os.spawnvp(os.P_NOWAIT, bin, [bin, "-nologo", "-nodefault", "-accept=%s" % op.connection]);
--                    time.sleep(1)
-+                    time.sleep(5)
-                     unocontext = resolver.resolve("uno:%s" % op.connection)
-                     break
-                 except Exception, e:

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
deleted file mode 100644
index c45ae6c..0000000
--- a/app-office/unoconv/files/unoconv-0.3-openoffice-3.2.patch
+++ /dev/null
@@ -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/files/unoconv-0.4-empty-ld-library-path.patch b/app-office/unoconv/files/unoconv-0.4-empty-ld-library-path.patch
deleted file mode 100644
index 5579f95..0000000
--- a/app-office/unoconv/files/unoconv-0.4-empty-ld-library-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Don't assume that LD_LIBRARY_PATH is set, since this won't be the case
-on a properly configured system, where all the library paths are
-configured via the linker.
-
---- unoconv.~1~	2010-12-13 11:45:27.000000000 +0100
-+++ unoconv	2010-12-13 11:45:45.000000000 +0100
-@@ -64,7 +64,7 @@
-             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']
-+            os.environ['LD_LIBRARY_PATH'] = oolibpath + os.pathsep + os.environ.get('LD_LIBRARY_PATH', '')
-             break
-         except ImportError, e:
-             sys.path.remove(oolibpath)

diff --git a/app-office/unoconv/files/unoconv-0.4-libreoffice.patch b/app-office/unoconv/files/unoconv-0.4-libreoffice.patch
deleted file mode 100644
index 9d3afdb..0000000
--- a/app-office/unoconv/files/unoconv-0.4-libreoffice.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 445f4f2b79384d942c0e0cd18231e6f6c81b0528
-Author: Hans de Graaff <hans@×××××××××.com>
-Date:   Wed Apr 27 12:49:31 2011 +0200
-
-    Add support for libreoffice.
-
-diff --git a/unoconv b/unoconv
-index 611b3fe..72a026b 100755
---- a/unoconv
-+++ b/unoconv
-@@ -20,7 +20,8 @@ global convertor, oobin, oobinpath, oolibpath, ooproc
- 
- ### The first thing we ought to do is find a suitable OpenOffice installation
- ### with a compatible pyuno library that we can import.
--extrapaths = glob.glob('/usr/lib*/openoffice*/program') + \
-+extrapaths = glob.glob('/usr/lib*/libreoffice*/basis*/program') + \
-+             glob.glob('/usr/lib*/openoffice*/program') + \
-              glob.glob('/usr/lib*/openoffice*/basis*/program') + \
-              glob.glob('/usr/lib*/ooo*/program') + \
-              glob.glob('/usr/lib*/ooo*/basis*/program') + \

diff --git a/app-office/unoconv/metadata.xml b/app-office/unoconv/metadata.xml
deleted file mode 100644
index fadb566..0000000
--- a/app-office/unoconv/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer><email>graaff@g.o</email></maintainer>
-</pkgmetadata>

diff --git a/app-office/unoconv/unoconv-0.3-r2.ebuild b/app-office/unoconv/unoconv-0.3-r2.ebuild
deleted file mode 100644
index 396bf6a..0000000
--- a/app-office/unoconv/unoconv-0.3-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/storm-0.13.ebuild,v 1.1 2008/10/26 05:04:25 neurogeek Exp $
-
-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"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.5
-	 || ( app-office/openoffice app-office/openoffice-bin )"
-DEPEND="dev-python/setuptools"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-openoffice-3.2.patch"
-	epatch "${FILESDIR}/${P}-longer-timeout.patch"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-}

diff --git a/app-office/unoconv/unoconv-0.4-r1.ebuild b/app-office/unoconv/unoconv-0.4-r1.ebuild
deleted file mode 100644
index b881d7a..0000000
--- a/app-office/unoconv/unoconv-0.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/storm-0.13.ebuild,v 1.1 2008/10/26 05:04:25 neurogeek Exp $
-
-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"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/python-2.5
-	 || ( app-office/openoffice app-office/openoffice-bin )"
-DEPEND="dev-python/setuptools
-	doc? ( app-text/asciidoc )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-empty-ld-library-path.patch"
-}
-
-src_compile ()
-{
-	if use doc; then
-		emake -C docs docs
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if use doc; then
-		dohtml docs/*.html || die "Can't install documentation."
-	fi
-}

diff --git a/app-office/unoconv/unoconv-0.4-r2.ebuild b/app-office/unoconv/unoconv-0.4-r2.ebuild
deleted file mode 100644
index ad26f40..0000000
--- a/app-office/unoconv/unoconv-0.4-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/storm-0.13.ebuild,v 1.1 2008/10/26 05:04:25 neurogeek Exp $
-
-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"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/python-2.5
-	 || ( app-office/libreoffice app-office/libreoffice-bin app-office/openoffice app-office/openoffice-bin )"
-DEPEND="dev-python/setuptools
-	doc? ( app-text/asciidoc )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-empty-ld-library-path.patch"
-	epatch "${FILESDIR}/${P}-libreoffice.patch"
-}
-
-src_compile ()
-{
-	if use doc; then
-		emake -C docs docs
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if use doc; then
-		dohtml docs/*.html || die "Can't install documentation."
-	fi
-}

diff --git a/app-office/unoconv/unoconv-0.4.ebuild b/app-office/unoconv/unoconv-0.4.ebuild
deleted file mode 100644
index 7ba2464..0000000
--- a/app-office/unoconv/unoconv-0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/storm-0.13.ebuild,v 1.1 2008/10/26 05:04:25 neurogeek Exp $
-
-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"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/python-2.5
-	 || ( app-office/openoffice app-office/openoffice-bin )"
-DEPEND="dev-python/setuptools
-	doc? ( app-text/asciidoc )"
-
-src_compile ()
-{
-	if use doc; then
-		emake -C docs docs
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if use doc; then
-		dohtml docs/*.html || die "Can't install documentation."
-	fi
-}