Block <catdoc-0.94.2-r2 wrt #314657.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-libs/libxls/ChangeLog b/dev-libs/libxls/ChangeLog
index 89ffde58bceeca36606f304dc92437f7dd53f473..784ad2bcaf818bc0c4511a7db4fe411301765d6b 100644 (file)
--- 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/Manifest b/dev-libs/libxls/Manifest
index aae9b062d22437bb3b3242013b663a18ea780356..80ae9647640dd7c7b5badc021da88f6076f45578 100644 (file)
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST libxls-0.2.0.tar.gz 351770 RMD160 36bf0ab84f7dfc6c90e48cfd571455d9d1554de1 SHA1 f385bd84104d98e0541919bcc316120cd9def0c4 SHA256 bdd068a540edbaabaea2159636485e8173a97d826312b97de96b25a6c0e3db20
-EBUILD libxls-0.2.0.ebuild 730 RMD160 c582ff14c8d3e7af8139363fe703f5f3be778dd9 SHA1 65166c1fd5186d1694d2c097c9b4313183bc1d74 SHA256 8ef78e56e3adf16fdf7c9a5b0e465c9c15b9e977289411a28ee80c9234a344a6
-MISC ChangeLog 429 RMD160 47fa1f2c5e195b91c4ead98abc3905db772d0e45 SHA1 ee204c11f5c08a4a199d06b38c675e1c7d565fa1 SHA256 7dc4c9cf9c4189977b04a2d83874cebb996ed9e13b1db2517cfe2c057d9bf0b0
+EBUILD libxls-0.2.0.ebuild 762 RMD160 7657db3a8f9956eab2dbfac2f31b5d6892d325e1 SHA1 7237a22ee067638128a38080cc0beb31207ee147 SHA256 a5e13fdf85e6a1babf6e741680546a28982daaa0e03802bd2d2cbf8a9c0f1a72
+MISC ChangeLog 547 RMD160 91b6a8a83d05219e7615355e27c8af04b8e0d1cb SHA1 abbbab4242d105e49ef233dc70ffa5dd71092ea6 SHA256 72fd07c79e3060901441c05b37ad774da170f356a5a0296ecd5d9c52aa9e9362
 MISC metadata.xml 266 RMD160 b4480e6518739202d8543a84b01b53940907f016 SHA1 3a5b0bff8b6ad1614a1e8fcbecddf54b800c80a2 SHA256 7aba9af99c2de45240978680e160a1bc959795d16c7eeeae6f2822ba59da9af2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvV+dQACgkQkKaRLQcq0GJ0uwCffMM0QR+sqKtvk3ch4pD0xvvv
-WloAniCPyYteIlXdlyQzmyCtdd3XQ2Wi
-=Zkwk
------END PGP SIGNATURE-----

diff --git a/dev-libs/libxls/libxls-0.2.0.ebuild b/dev-libs/libxls/libxls-0.2.0.ebuild
index 2bd313929c690524f8c6ea2a7ab313f40cb6b7a8..0adeb075932a3d5da867c2e2c669cb015355f23c 100644 (file)
--- 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"