diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-03-31 11:59:35 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-03-31 11:59:35 +0000 |
| commit | 253eee5f3ed54e3e0e0b5c75435a0b5ad06770fc (patch) | |
| tree | 2e8bf127316947b3a8e8cb6c4ae3157f3712199c /app-text | |
| parent | alpha/ia64/sparc/x86 stable wrt #402765 (diff) | |
| download | gentoo-2-253eee5f3ed54e3e0e0b5c75435a0b5ad06770fc.tar.gz gentoo-2-253eee5f3ed54e3e0e0b5c75435a0b5ad06770fc.tar.bz2 gentoo-2-253eee5f3ed54e3e0e0b5c75435a0b5ad06770fc.zip | |
Add blocker on app-office/unoconv which is different approach for the solution provided here. Wrt bug#410057.
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/odt2txt/ChangeLog | 8 | ||||
| -rw-r--r-- | app-text/odt2txt/odt2txt-0.4-r1.ebuild | 22 |
2 files changed, 19 insertions, 11 deletions
diff --git a/app-text/odt2txt/ChangeLog b/app-text/odt2txt/ChangeLog index 8ea10e8b84e5..2df7647e56bb 100644 --- a/app-text/odt2txt/ChangeLog +++ b/app-text/odt2txt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/odt2txt -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/odt2txt/ChangeLog,v 1.7 2011/02/02 15:57:28 halcy0n Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/odt2txt/ChangeLog,v 1.8 2012/03/31 11:59:35 scarabeus Exp $ + + 31 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> odt2txt-0.4-r1.ebuild: + Add blocker on app-office/unoconv which is different approach for the solution + provided here. Wrt bug#410057. 02 Feb 2011; Mark Loeser <halcy0n@gentoo.org> odt2txt-0.4-r1.ebuild: Mark ~ppc64; bug #296794 diff --git a/app-text/odt2txt/odt2txt-0.4-r1.ebuild b/app-text/odt2txt/odt2txt-0.4-r1.ebuild index fefdd79b77dc..a6743d4847e1 100644 --- a/app-text/odt2txt/odt2txt-0.4-r1.ebuild +++ b/app-text/odt2txt/odt2txt-0.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/odt2txt/odt2txt-0.4-r1.ebuild,v 1.5 2011/02/02 15:57:28 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/odt2txt/odt2txt-0.4-r1.ebuild,v 1.6 2012/03/31 11:59:35 scarabeus Exp $ -EAPI=2 +EAPI=4 inherit eutils toolchain-funcs @@ -15,10 +15,14 @@ SLOT="0" KEYWORDS="alpha amd64 ia64 ~ppc64 sparc x86 ~x86-macos" IUSE="" -RDEPEND="sys-libs/zlib - virtual/libiconv" -DEPEND="sys-apps/groff - ${RDEPEND}" +RDEPEND=" + !app-office/unoconv + sys-libs/zlib + virtual/libiconv +" +DEPEND="${RDEPEND} + sys-apps/groff +" src_prepare() { epatch "${FILESDIR}"/${P}-darwin_iconv.patch @@ -29,6 +33,6 @@ src_compile() { } src_install() { - emake install DESTDIR="${D}" PREFIX=/usr || die - doman odt2txt.1 || die + emake install DESTDIR="${D}" PREFIX=/usr + doman odt2txt.1 } |