summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-28 17:57:45 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-28 17:57:45 +0000
commitc21da6e44b72ea123b1470f449fbbe45184919e7 (patch)
tree1d38abf445f34cc47c4305f4bcefa1103f385401 /dev-python/pyPdf
parentarm/sh stable (diff)
downloadgentoo-2-c21da6e44b72ea123b1470f449fbbe45184919e7.tar.gz
gentoo-2-c21da6e44b72ea123b1470f449fbbe45184919e7.tar.bz2
gentoo-2-c21da6e44b72ea123b1470f449fbbe45184919e7.zip
28 Apr 2009; Zac Medico <zmedico@gentoo.org> pyPdf-1.12.ebuild:
Block =app-text/calibre-0.5.9 due to file collision (bug #258938). (Portage version: 2.2_rc31_p13404/cvs/Linux i686)
Diffstat (limited to 'dev-python/pyPdf')
-rw-r--r--dev-python/pyPdf/ChangeLog5
-rw-r--r--dev-python/pyPdf/pyPdf-1.12.ebuild3
2 files changed, 6 insertions, 2 deletions
diff --git a/dev-python/pyPdf/ChangeLog b/dev-python/pyPdf/ChangeLog
index 352f063a3d2c..4c21c10cdaef 100644
--- a/dev-python/pyPdf/ChangeLog
+++ b/dev-python/pyPdf/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/pyPdf
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyPdf/ChangeLog,v 1.3 2009/02/12 11:38:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyPdf/ChangeLog,v 1.4 2009/04/28 17:57:45 zmedico Exp $
+
+ 28 Apr 2009; Zac Medico <zmedico@gentoo.org> pyPdf-1.12.ebuild:
+ Block =app-text/calibre-0.5.9 due to file collision (bug #258938).
12 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
pyPdf-1.12.ebuild:
diff --git a/dev-python/pyPdf/pyPdf-1.12.ebuild b/dev-python/pyPdf/pyPdf-1.12.ebuild
index a0f17b440a58..2470858590c0 100644
--- a/dev-python/pyPdf/pyPdf-1.12.ebuild
+++ b/dev-python/pyPdf/pyPdf-1.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyPdf/pyPdf-1.12.ebuild,v 1.3 2009/02/12 11:38:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyPdf/pyPdf-1.12.ebuild,v 1.4 2009/04/28 17:57:45 zmedico Exp $
inherit distutils
@@ -11,3 +11,4 @@ LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
+RDEPEND="!=app-text/calibre-0.5.9"