fix changelog header; use only one doc? in DEPEND

Package-Manager: portage-2.0.53_rc7

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index bfdd979255748065b243cb7d831e009760b1116f..337eceaf58c62ef4fcec2611b550b78972b6227f 100644 (file)
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for sci-libs/charm
+# 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.1 2005/11/10 15:11:55 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.2 2005/11/10 16:30:46 swegener Exp $
 
   10 Nov 2005; Markus Dittrich <markusle@gentoo.org>
   +files/charm-charmc-gentoo.patch, +files/charm-doc-makefile-gentoo.patch,

diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 5dfa4b56da30352bad34d30644d6e2c5bceb640e..531baf0f6e8da4e8a5ee536fef60b271c5423299 100644 (file)
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,9 +1,9 @@
-MD5 60913450dc779d0a5b4ee092fcd9b7ca charm-5.9.ebuild 3506
-MD5 5dc79a9b4cbe90fdcba2d3cdea103db2 ChangeLog 939
-MD5 0ffcd41aa96cf1bcffd8b539c27957db metadata.xml 157
-MD5 43245f7dc8f2b58f1980c467341773c4 files/digest-charm-5.9 62
+MD5 cc45e68bcc36e086fc4bb3a5228e743e ChangeLog 942
+MD5 250650befaae98eb5882b7a999895cbd charm-5.9.ebuild 3469
 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
 MD5 42f61a51a66dc7707feb2cfe1d5aca80 files/charm-fpic-gentoo.patch 963
 MD5 24b09ea5cfbd4065c8fac2404401f991 files/charm-python-configure-gentoo.patch 984
-MD5 6ffec6746277d139021ebb96789fbd8a files/charm-doc-makefile-gentoo.patch 1348
+MD5 43245f7dc8f2b58f1980c467341773c4 files/digest-charm-5.9 62
+MD5 0ffcd41aa96cf1bcffd8b539c27957db metadata.xml 157

diff --git a/sys-cluster/charm/charm-5.9.ebuild b/sys-cluster/charm/charm-5.9.ebuild
index 115a17ab80f0764f4f56e62861bbbb0a9f05646e..7708d0885c1f083d10ecf52f5b1118bfdf50a63d 100644 (file)
--- 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
 # 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.1 2005/11/10 15:11:55 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-5.9.ebuild,v 1.2 2005/11/10 16:30:46 swegener Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -16,14 +16,15 @@ IUSE="cmkopt tcp smp doc icc"
 RESTRICT="fetch"
 
 DEPEND="icc? ( >=dev-lang/icc-8.1 )
-       doc? ( app-text/pdftohtml )
-       doc? ( dev-tex/latex2html )
-       doc? ( virtual/tetex )"
+       doc? (
+               app-text/pdftohtml
+               dev-tex/latex2html
+               virtual/tetex
+       )"
 
 CHARM_ARCH="net-linux"
 CHARM_DOWNLOAD="http://charm.cs.uiuc.edu/download/"
 
-
 pkg_nofetch() {
        echo
        einfo "Please download ${P}.tar.gz from"
@@ -79,7 +80,6 @@ src_unpack() {
 
 src_compile() {
        # build charmm++ first
-       cd "${S}"
        ./build charm++ net-linux ${CHARM_OPTS} ${CFLAGS} || \
                die "Failed to build charm++"
 
@@ -91,8 +91,6 @@ src_compile() {
 }
 
 src_install() {
-       cd "${S}"
-
        # make charmc play well with gentoo before
        # we move it into /usr/bin
        einfo "Fixing paths in charmc wrapper"