diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-05-03 21:36:42 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-03 21:36:42 +0000 |
| commit | cdd2b3255f51932eae2f067ceda13db9de682bcc (patch) | |
| tree | 840fab52c8d2326d82709da89e9df946855ed02f /dev-libs | |
| parent | Version bump KDE 4.4.3 (diff) | |
| download | gentoo-2-cdd2b3255f51932eae2f067ceda13db9de682bcc.tar.gz gentoo-2-cdd2b3255f51932eae2f067ceda13db9de682bcc.tar.bz2 gentoo-2-cdd2b3255f51932eae2f067ceda13db9de682bcc.zip | |
Block <catdoc-0.94.2-r2 wrt #314657.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libxls/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/libxls/libxls-0.2.0.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-libs/libxls/ChangeLog b/dev-libs/libxls/ChangeLog index 89ffde58bcee..784ad2bcaf81 100644 --- a/dev-libs/libxls/ChangeLog +++ b/dev-libs/libxls/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/libxls # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxls/ChangeLog,v 1.2 2010/04/26 20:39:59 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxls/ChangeLog,v 1.3 2010/05/03 21:36:42 ssuominen Exp $ + + 03 May 2010; Samuli Suominen <ssuominen@gentoo.org> libxls-0.2.0.ebuild: + Block <catdoc-0.94.2-r2 wrt #314657. 26 Apr 2010; Markus Meier <maekke@gentoo.org> libxls-0.2.0.ebuild: amd64/x86 stable, bug #309717 diff --git a/dev-libs/libxls/libxls-0.2.0.ebuild b/dev-libs/libxls/libxls-0.2.0.ebuild index 2bd313929c69..0adeb075932a 100644 --- a/dev-libs/libxls/libxls-0.2.0.ebuild +++ b/dev-libs/libxls/libxls-0.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxls/libxls-0.2.0.ebuild,v 1.2 2010/04/26 20:39:59 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxls/libxls-0.2.0.ebuild,v 1.3 2010/05/03 21:36:42 ssuominen Exp $ EAPI=2 @@ -13,7 +13,8 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -RDEPEND="virtual/libintl" +RDEPEND="virtual/libintl + !<app-text/catdoc-0.94.2-r2" DEPEND="${RDEPEND} dev-util/pkgconfig" |