summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-03-31 11:57:35 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-03-31 11:57:35 +0000
commite30c5cfa4a9b744e09558d5fec3498116d085fa7 (patch)
treed10b27460d979131b859d7ee4c34ac010b9cca3b /app-office/unoconv
parentIntroduce a separate ebuild for the first release of systemd-ui. (diff)
downloadgentoo-2-e30c5cfa4a9b744e09558d5fec3498116d085fa7.tar.gz
gentoo-2-e30c5cfa4a9b744e09558d5fec3498116d085fa7.tar.bz2
gentoo-2-e30c5cfa4a9b744e09558d5fec3498116d085fa7.zip
Add blocker on app-text/odt2txt 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-office/unoconv')
-rw-r--r--app-office/unoconv/ChangeLog7
-rw-r--r--app-office/unoconv/unoconv-20120327.ebuild4
-rw-r--r--app-office/unoconv/unoconv-99999999.ebuild6
3 files changed, 13 insertions, 4 deletions
diff --git a/app-office/unoconv/ChangeLog b/app-office/unoconv/ChangeLog
index 84126bda39f6..6927b97fe5d1 100644
--- a/app-office/unoconv/ChangeLog
+++ b/app-office/unoconv/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-office/unoconv
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/unoconv/ChangeLog,v 1.2 2012/03/27 16:27:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/unoconv/ChangeLog,v 1.3 2012/03/31 11:57:35 scarabeus Exp $
+
+ 31 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> unoconv-20120327.ebuild,
+ unoconv-99999999.ebuild:
+ Add blocker on app-text/odt2txt which is different approach for the solution
+ provided here. Wrt bug#410057.
*unoconv-20120327 (27 Mar 2012)
diff --git a/app-office/unoconv/unoconv-20120327.ebuild b/app-office/unoconv/unoconv-20120327.ebuild
index 5b04c2d15110..0e96beea8f25 100644
--- a/app-office/unoconv/unoconv-20120327.ebuild
+++ b/app-office/unoconv/unoconv-20120327.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/unoconv/unoconv-20120327.ebuild,v 1.1 2012/03/27 16:27:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/unoconv/unoconv-20120327.ebuild,v 1.2 2012/03/31 11:57:35 scarabeus Exp $
EAPI=3
@@ -19,7 +19,9 @@ SLOT="0"
[[ ${PV} == 9999* ]] || KEYWORDS="~amd64 ~x86"
IUSE=""
+DEPEND=""
RDEPEND="${DEPEND}
+ !app-text/odt2txt
virtual/ooo
"
diff --git a/app-office/unoconv/unoconv-99999999.ebuild b/app-office/unoconv/unoconv-99999999.ebuild
index a85d914a9cfd..e99be5270849 100644
--- a/app-office/unoconv/unoconv-99999999.ebuild
+++ b/app-office/unoconv/unoconv-99999999.ebuild
@@ -1,6 +1,6 @@
-# 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-office/unoconv/unoconv-99999999.ebuild,v 1.1 2011/09/23 13:24:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/unoconv/unoconv-99999999.ebuild,v 1.2 2012/03/31 11:57:35 scarabeus Exp $
EAPI=3
@@ -19,7 +19,9 @@ SLOT="0"
[[ ${PV} == 9999* ]] || KEYWORDS="~amd64 ~x86"
IUSE=""
+DEPEND=""
RDEPEND="${DEPEND}
+ !app-text/odt2txt
virtual/ooo
"