app-office/unoconv: app-office/unoconv moved to gentoo-x86, bug 262083 is fixed.

svn path=/sunrise/; revision=12426

diff --git a/app-office/unoconv/ChangeLog b/app-office/unoconv/ChangeLog
deleted file mode 100644 (file)
index 2e02f91..0000000
--- a/app-office/unoconv/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-# ChangeLog for app-office/unoconv
-# 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,
-  +metadata.xml:
-  New ebuild for bug 345405 thanks to Graaff for initial ebuild, thanks to
-  Walter 'DaK_TaLeS' Dacol for the ebuild and the wrapper
-

diff --git a/app-office/unoconv/Manifest b/app-office/unoconv/Manifest
deleted file mode 100644 (file)
index 8b3b404..0000000
--- a/app-office/unoconv/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX unoconv-0.3-longer-timeout.patch 554 RMD160 b8007fa78904c8b1495e6e3e202d69bd3c8a43d5 SHA1 2dff02b6348328bdcccd47a6c6c88273b36ccf8f SHA256 44635640d248ff98c2254a5740a74842ebc0e3a83835639e50d3698e4b298f8e
-AUX unoconv-0.3-openoffice-3.2-libreoffice.patch 647 RMD160 bbc4eff17e4f304baedda8d6818d0c156cead501 SHA1 6768844157fec40a23b230faf633a35574912b5d SHA256 6d03b6dabca154e2908d0df129a73044416854f5aab18230c1829f9a8435bc07
-AUX unoconv-0.3-openoffice-3.2.patch 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-AUX unoconv-wrapper 350 RMD160 7ae9d519f619e3e6458ddcc2e471eecffead398b SHA1 d47874b0827376e257acb3620147b4db3624d352 SHA256 ad34aba376b88f5b5edce44a84abae2daf468e42ef493f99966e5c8d8811a95e
-DIST unoconv-0.3.tar.bz2 59623 RMD160 6d3eaac9adcedfa492fb6d15d708e9d96d02e18d SHA1 7e4f5fee9075bec05175a773273506baf9b6c191 SHA256 6e1d0701ce6cedb2b21a1b2945f4f774500c4a10cf9d20a718e7a520f4549051
-EBUILD unoconv-0.3-r4.ebuild 823 RMD160 126d6fd25be38210d9891f4dbeafb2a150128fa3 SHA1 13501430c6a11dfb892917e5c95c2cb53fbc1256 SHA256 686c6d8351217a2fed6b4dd3898e3af6684db9f3e75c5449d5f407f901673923
-MISC ChangeLog 740 RMD160 2181591141cd496499160a7f473cfd0e0bade27b SHA1 06aa2fcef71b445e37c9453d156ec0937f07446d SHA256 c753452210168990e166a32683cf297beb83d3d41f5b36454a3f0d53916cf854
-MISC metadata.xml 212 RMD160 ac56e3609edc88fcf86b16a2eb26c59927199992 SHA1 474ac6d965427baa87433c36160213945cb858f3 SHA256 85e67f74295a14d0a3ae6ae910657d81d8f32a8abae19debda5deb950a58fe03

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 (file)
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-libreoffice.patch b/app-office/unoconv/files/unoconv-0.3-openoffice-3.2-libreoffice.patch
deleted file mode 100644 (file)
index 6f45690..0000000
--- a/app-office/unoconv/files/unoconv-0.3-openoffice-3.2-libreoffice.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/app-office/unoconv/files/unoconv-wrapper b/app-office/unoconv/files/unoconv-wrapper
deleted file mode 100644 (file)
index d067888..0000000
--- a/app-office/unoconv/files/unoconv-wrapper
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Wrapper for unoconv, see http://bugs.gentoo.org/show_bug.cgi?format=multiple&id=262083
-# for more detail.
-
-OOO_BIN="/usr/lib/openoffice/program/python"
-OOO_SOURCE="/usr/bin/python"
-UNOCONV="/usr/share/unoconv/unoconv"
-
-if [ -x "${OOO_BIN}" ]; then
-       exec "${OOO_BIN}" "${UNOCONV}" "${@}"
-else
-       exec "${OOO_SOURCE}" "${UNOCONV}" "${@}"
-fi

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

diff --git a/app-office/unoconv/unoconv-0.3-r4.ebuild b/app-office/unoconv/unoconv-0.3-r4.ebuild
deleted file mode 100644 (file)
index 2a1a288..0000000
--- a/app-office/unoconv/unoconv-0.3-r4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 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/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/asciidoc
-       dev-python/setuptools"
-RDEPEND="|| ( app-office/openoffice app-office/openoffice-bin
-               app-office/libreoffice app-office/libreoffice-bin )"
-
-src_prepare() {
-       epatch "${FILESDIR}/${P}-openoffice-3.2-libreoffice.patch" \
-               "${FILESDIR}/${P}-longer-timeout.patch"
-}
-
-src_install() {
-       emake install DESTDIR="${D}" bindir='$(prefix)/share/unoconv' || die
-       newbin "${FILESDIR}"/unoconv-wrapper unoconv || die
-}