summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-02-10 22:32:11 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-02-10 22:32:11 +0000
commit8754fe6d3761cc9aac9742f8ad7db99ce5bcad65 (patch)
tree266237b307f54ffb56b921795cde3d4ea04a4025 /sys-cluster
parentAdd nv_faxdetect as scavenged by Cory Coager in bug #298328. Trim unnecessary... (diff)
downloadhistorical-8754fe6d3761cc9aac9742f8ad7db99ce5bcad65.tar.gz
historical-8754fe6d3761cc9aac9742f8ad7db99ce5bcad65.tar.bz2
historical-8754fe6d3761cc9aac9742f8ad7db99ce5bcad65.zip
Fix poppler depend.
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/charm/ChangeLog7
-rw-r--r--sys-cluster/charm/Manifest4
-rw-r--r--sys-cluster/charm/charm-6.1.2-r2.ebuild22
3 files changed, 16 insertions, 17 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 6f343a81af44..9d053456b6b5 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-cluster/charm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.26 2009/11/27 08:49:04 je_fro Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.27 2010/02/10 22:32:11 ssuominen Exp $
+
+ 10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> charm-6.1.2-r2.ebuild:
+ Fix poppler depend.
27 Nov 2009; Jeff Gardner <je_fro@gentoo.org> charm-6.1.2-r2.ebuild,
files/charm-6.1.2-charmc-gentoo.patch:
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index df543517959b..440d17824e5c 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -10,6 +10,6 @@ AUX charm-python-configure-gentoo.patch 984 RMD160 fb7f9279e528d3e74756c734c6837
DIST charm-5.9.tar.gz 7580639 RMD160 ebc3a8515fd918c6e0fc0fd9963a22b3ae5d057d SHA1 8b34d083486e6350ddf31a71e7476d6027ef9c0f SHA256 b5f8d53f0b447dbd720a0f2607a0e7902c227c7377326bf279e448ed570dcc89
DIST charm-6.1.2_src.tar.gz 24177223 RMD160 bdd6e88a8596139303025d5ecd484a4634811dc9 SHA1 0e6cee877f22794cb647ab22ef5651048abcbbd0 SHA256 cc8a522ddf495fdd44f8134d82dfe0a17b72c2cf5962960688463d3115e8e366
EBUILD charm-5.9.ebuild 3825 RMD160 aab9026110c2eb0b4d979b8f1d5e35496be9ebb7 SHA1 2160b0bcd683cf03443f403afbb293cc144b408f SHA256 a0e46b1177cb2a916e55e0a1a8b8bcf9829900f134812a7e7303d0bc0f59166a
-EBUILD charm-6.1.2-r2.ebuild 3076 RMD160 486daf2d9518589eeb81d91020fe1be28e308b5d SHA1 1f6a03bcf05c59b1952b78e72ddaa8515038294b SHA256 1fcba32c099d176ce7ec0757e78292b64f7f5913e7950b36428dea2133614947
-MISC ChangeLog 4321 RMD160 6e892e2f9a9f994118d70b84aaaf98f5b4b896da SHA1 ec6c766bee63fef712a41cad32c5b75e946a20b9 SHA256 9a063b18d7de4572368e0574bd750e98acda14fea5062a67984700c37c153a47
+EBUILD charm-6.1.2-r2.ebuild 3067 RMD160 b0eb875d05e55d19db487c5c5ab70c113f27acc2 SHA1 e706e1a3df8acd1670a739c5e2e227765677f69f SHA256 9169b6b09855f4612259f6bb1db63bea9f9153b4116b69c2b7112ae0bf198a98
+MISC ChangeLog 4424 RMD160 eb2ad03acfda8b0c40f36875a8807f55c8c7bd30 SHA1 32bb3147dfe87e6bb2cf3a9fa11efa06394f7a42 SHA256 4dffcfc33a8318efa9760b1d86324440e46e385e4f03eb0316e4f3fc7a115920
MISC metadata.xml 398 RMD160 bf40832b2220f644b2d56f653a41f047d0184b85 SHA1 9782cf178225fb5944bc6612076ff81c2512c842 SHA256 bc7d0905ab52e35d45967685ef8106826e8bfaacc7a0f58ae652fdb2b863e33d
diff --git a/sys-cluster/charm/charm-6.1.2-r2.ebuild b/sys-cluster/charm/charm-6.1.2-r2.ebuild
index f51ff5148d45..d6eb05adb2dc 100644
--- a/sys-cluster/charm/charm-6.1.2-r2.ebuild
+++ b/sys-cluster/charm/charm-6.1.2-r2.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.3 2009/11/27 08:51:52 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.4 2010/02/10 22:32:10 ssuominen Exp $
+EAPI=2
inherit eutils toolchain-funcs flag-o-matic multilib
DESCRIPTION="Charm++ is a message-passing parallel language and runtime system."
LICENSE="charm"
HOMEPAGE="http://charm.cs.uiuc.edu/"
SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}_src.tar.gz"
-S="${WORKDIR}/${P}"
+
+LICENSE="charm"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="cmkopt tcp smp doc"
-DEPEND="doc? ( virtual/poppler-utils
- dev-tex/latex2html
- virtual/tex-base
- )"
-
+DEPEND="doc? ( >=app-text/poppler-0.12.3-r3[utils]
+ dev-tex/latex2html
+ virtual/tex-base )"
RDEPEND=""
case ${ARCH} in
-
x86)
CHARM_ARCH="net-linux" ;;
@@ -29,10 +28,7 @@ case ${ARCH} in
CHARM_ARCH="net-linux-amd64" ;;
esac
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
epatch "${FILESDIR}/${P}-charmrun.patch"
# TCP instead of default UDP for socket comunication