[gentoo-commits] gentoo-x86 commit in dev-libs/libxls: ChangeLog libxls-0.2.0.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    10/05/03 21:36:42

  Modified:             ChangeLog libxls-0.2.0.ebuild
  Log:
  Block <catdoc-0.94.2-r2 wrt #314657.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  dev-libs/libxls/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxls/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxls/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxls/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libxls/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	26 Apr 2010 20:39:59 -0000	1.2
+++ ChangeLog	3 May 2010 21:36:42 -0000	1.3
@@ -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@g.o> libxls-0.2.0.ebuild:
+  Block <catdoc-0.94.2-r2 wrt #314657.
 
   26 Apr 2010; Markus Meier <maekke@g.o> libxls-0.2.0.ebuild:
   amd64/x86 stable, bug #309717



1.3                  dev-libs/libxls/libxls-0.2.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxls/libxls-0.2.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxls/libxls-0.2.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxls/libxls-0.2.0.ebuild?r1=1.2&r2=1.3

Index: libxls-0.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libxls/libxls-0.2.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libxls-0.2.0.ebuild	26 Apr 2010 20:39:59 -0000	1.2
+++ libxls-0.2.0.ebuild	3 May 2010 21:36:42 -0000	1.3
@@ -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 @@
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="virtual/libintl"
+RDEPEND="virtual/libintl
+	!<app-text/catdoc-0.94.2-r2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"