summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2006-01-12 21:38:26 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2006-01-12 21:38:26 +0000
commitd64b01990d18d0abdec323805c798350536b83ed (patch)
tree1feca0679d65bd5448a973589ed28d78d3d4e4a2
parentTypo in dodoc (bug #118806). (diff)
downloadhistorical-d64b01990d18d0abdec323805c798350536b83ed.tar.gz
historical-d64b01990d18d0abdec323805c798350536b83ed.tar.bz2
historical-d64b01990d18d0abdec323805c798350536b83ed.zip
app-text/poppler also provides pdftohtml.
Package-Manager: portage-2.1_pre3-r1
-rw-r--r--sys-cluster/charm/ChangeLog7
-rw-r--r--sys-cluster/charm/Manifest4
-rw-r--r--sys-cluster/charm/charm-5.9.ebuild6
3 files changed, 10 insertions, 7 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 7e93e85191ac..f0af6b4cd17c 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-cluster/charm
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.3 2005/12/22 15:44:25 markusle Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.4 2006/01/12 21:38:26 robbat2 Exp $
+
+ 12 Jan 2006; Robin H. Johnson <robbat2@gentoo.org> charm-5.9.ebuild:
+ app-text/poppler also provides pdftohtml.
22 Dec 2005; Markus Dittrich <markusle@gentoo.org> metadata.xml:
removed from package.mask and marked as ~x86. Changed maintainer to
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index a7e74cb1b487..87b47d5da7f5 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,5 +1,5 @@
-MD5 60c5de8d3f9d76113bd5c83838263827 ChangeLog 1105
-MD5 250650befaae98eb5882b7a999895cbd charm-5.9.ebuild 3469
+MD5 ee360f66d5ad204fab761afb9a879da9 ChangeLog 1220
+MD5 c097c3c96244b856656e07cf950a500e charm-5.9.ebuild 3492
MD5 0b343e0d9021a96327bd9255a3ed885d files/charm-charmc-gentoo.patch 1078
MD5 6ffec6746277d139021ebb96789fbd8a files/charm-doc-makefile-gentoo.patch 1348
MD5 33c5bf01e103e9957966f8de2dbec2a5 files/charm-examples-gentoo.patch 21815
diff --git a/sys-cluster/charm/charm-5.9.ebuild b/sys-cluster/charm/charm-5.9.ebuild
index 7708d0885c1f..1c28be25f223 100644
--- a/sys-cluster/charm/charm-5.9.ebuild
+++ b/sys-cluster/charm/charm-5.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-5.9.ebuild,v 1.2 2005/11/10 16:30:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-5.9.ebuild,v 1.3 2006/01/12 21:38:26 robbat2 Exp $
inherit eutils toolchain-funcs flag-o-matic
@@ -17,7 +17,7 @@ RESTRICT="fetch"
DEPEND="icc? ( >=dev-lang/icc-8.1 )
doc? (
- app-text/pdftohtml
+ || ( app-text/pdftohtml app-text/poppler )
dev-tex/latex2html
virtual/tetex
)"