public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-cluster/charm: charm-6.1.2-r2.ebuild ChangeLog
@ 2009-11-27  5:26 Jeffrey Gardner (je_fro)
  0 siblings, 0 replies; 4+ messages in thread
From: Jeffrey Gardner (je_fro) @ 2009-11-27  5:26 UTC (permalink / raw
  To: gentoo-commits

je_fro      09/11/27 05:26:01

  Modified:             ChangeLog
  Added:                charm-6.1.2-r2.ebuild
  Log:
  Fix up some no-no's in the ebuild thanks to flameeyes in bug #294463
  (Portage version: 2.1.7.7/cvs/Linux x86_64)

Revision  Changes    Path
1.24                 sys-cluster/charm/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?r1=1.23&r2=1.24

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog	31 Aug 2009 08:53:37 -0000	1.23
+++ ChangeLog	27 Nov 2009 05:26:01 -0000	1.24
@@ -1,6 +1,11 @@
 # 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.23 2009/08/31 08:53:37 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.24 2009/11/27 05:26:01 je_fro Exp $
+
+*charm-6.1.2-r2 (27 Nov 2009)
+
+  27 Nov 2009; Jeff Gardner <je_fro@gentoo.org> +charm-6.1.2-r2.ebuild:
+  Fix up some no-no's in the ebuild thanks to flameeyes in bug #294463.
 
   31 Aug 2009; Peter Alfredsen <loki_val@gentoo.org> charm-6.1.2.ebuild,
   charm-6.1.2-r1.ebuild:



1.1                  sys-cluster/charm/charm-6.1.2-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild?rev=1.1&content-type=text/plain

Index: charm-6.1.2-r2.ebuild
===================================================================
# Copyright 1999-2009 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.1 2009/11/27 05:26:01 je_fro Exp $

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}"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="cmkopt tcp smp doc"

DEPEND="doc? ( virtual/poppler-utils
		dev-tex/latex2html
		virtual/tex-base
		)"

RDEPEND=""

case ${ARCH} in

	x86)
		CHARM_ARCH="net-linux" ;;

	amd64)
		CHARM_ARCH="net-linux-amd64" ;;
esac

src_unpack() {
	unpack ${A}
	cd "${S}"

	epatch "${FILESDIR}/${P}-charmrun.patch"

	# TCP instead of default UDP for socket comunication
	# protocol
	if use tcp; then
		CHARM_OPTS="${CHARM_OPTS} tcp"
	fi

	# enable direct SMP support using shared memory
	if use smp; then
		CHARM_OPTS="${CHARM_OPTS} smp"
	fi

	# CMK optimization
	if use cmkopt; then
		append-flags -DCMK_OPTIMIZE=1
	fi

	echo "charm opts: ${CHARM_OPTS}"
}

src_compile() {
	# build charmm++ first
	cd "${S}"
	./build charm++ ${CHARM_ARCH} ${CHARM_OPTS} ${CFLAGS} || \
		die "Failed to build charm++"

	# make pdf/html docs
	if use doc; then
		cd "${S}"/doc
		make doc || die "failed to create pdf/html docs"
	fi
}

src_install() {
	# make charmc play well with gentoo before
	# we move it into /usr/bin
	epatch "${FILESDIR}/${P}-charmc-gentoo.patch"

	sed -e "s|gentoo-include|${P}|" \
		-e "s|gentoo-libdir|$(get_libdir)|g" \
		-e "s|VERSION|${P}/VERSION|" \
		-i ./src/scripts/charmc || die "failed patching charmc script"

	# install binaries
	cd "${S}"/bin
	dobin ./charmd ./charmd_faceless ./charmr* ./charmc ./charmxi \
		./conv-cpm ./dep.pl || die "Failed to install binaries"

	# install headers
	cd "${S}"/include
	insinto /usr/include/${P}
	doins * || die "failed to install header files"

	# install static libs
	cd "${S}"/lib
	dolib.a *.a || die "failed to install static libs"

	# install shared libs
	cd "${S}"/lib_so
	dolib.so *.so* || die "failed to install shared libs"

	# basic docs
	cd "${S}"
	dodoc CHANGES README  || die "Failed to install docs"

	# install examples
	find examples/ -name 'Makefile' | xargs sed \
		-r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \
		die "Failed to fix examples"
	find examples/ -name 'Makefile' | xargs sed \
		-r "s:./charmrun:./charmrun ++local:" -i || \
		die "Failed to fix examples"
	insinto /usr/share/doc/${PF}/examples
	doins -r examples/charm++/*

	# pdf/html docs
	if use doc; then
		cd "${S}"/doc
		# install pdfs
		insinto /usr/share/doc/${PF}/pdf
		doins  doc/pdf/* || die "failed to install pdf docs"
		# install html
		docinto html
		dohtml -r doc/html/* || die "failed to install html docs"
	fi
}

pkg_postinst() {
	echo
	einfo "Please test your charm installation by copying the"
	einfo "content of /usr/share/doc/${PF}/examples to a"
	einfo "temporary location and run 'make test'."
	echo
}






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-cluster/charm: charm-6.1.2-r2.ebuild ChangeLog
@ 2009-11-27  8:49 Jeffrey Gardner (je_fro)
  0 siblings, 0 replies; 4+ messages in thread
From: Jeffrey Gardner (je_fro) @ 2009-11-27  8:49 UTC (permalink / raw
  To: gentoo-commits

je_fro      09/11/27 08:49:04

  Modified:             charm-6.1.2-r2.ebuild ChangeLog
  Log:
  Fix patch
  (Portage version: 2.1.7.7/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sys-cluster/charm/charm-6.1.2-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild?r1=1.1&r2=1.2

Index: charm-6.1.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- charm-6.1.2-r2.ebuild	27 Nov 2009 05:26:01 -0000	1.1
+++ charm-6.1.2-r2.ebuild	27 Nov 2009 08:49:04 -0000	1.2
@@ -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/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.1 2009/11/27 05:26:01 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.2 2009/11/27 08:49:04 je_fro Exp $
 
 inherit eutils toolchain-funcs flag-o-matic multilib
 
@@ -68,6 +68,9 @@
 }
 
 src_install() {
+pwd
+	cd "${S}"
+pwd
 	# make charmc play well with gentoo before
 	# we move it into /usr/bin
 	epatch "${FILESDIR}/${P}-charmc-gentoo.patch"



1.26                 sys-cluster/charm/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?r1=1.25&r2=1.26

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	27 Nov 2009 07:08:50 -0000	1.25
+++ ChangeLog	27 Nov 2009 08:49:04 -0000	1.26
@@ -1,6 +1,10 @@
 # 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.25 2009/11/27 07:08:50 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.26 2009/11/27 08:49:04 je_fro Exp $
+
+  27 Nov 2009; Jeff Gardner <je_fro@gentoo.org> charm-6.1.2-r2.ebuild,
+  files/charm-6.1.2-charmc-gentoo.patch:
+  Fix patch again
 
   27 Nov 2009; Jeff Gardner <je_fro@gentoo.org> -charm-6.1.2.ebuild,
   -charm-6.1.2-r1.ebuild, files/charm-6.1.2-charmc-gentoo.patch:






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-cluster/charm: charm-6.1.2-r2.ebuild ChangeLog
@ 2010-02-10 22:32 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 4+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-02-10 22:32 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/02/10 22:32:11

  Modified:             charm-6.1.2-r2.ebuild ChangeLog
  Log:
  Fix poppler depend.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  sys-cluster/charm/charm-6.1.2-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild?r1=1.3&r2=1.4

Index: charm-6.1.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- charm-6.1.2-r2.ebuild	27 Nov 2009 08:51:52 -0000	1.3
+++ charm-6.1.2-r2.ebuild	10 Feb 2010 22:32:10 -0000	1.4
@@ -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 @@
 		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



1.27                 sys-cluster/charm/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?r1=1.26&r2=1.27

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog	27 Nov 2009 08:49:04 -0000	1.26
+++ ChangeLog	10 Feb 2010 22:32:11 -0000	1.27
@@ -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:






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-cluster/charm: charm-6.1.2-r2.ebuild ChangeLog
@ 2010-04-23 19:09 Donnie Berkholz (dberkholz)
  0 siblings, 0 replies; 4+ messages in thread
From: Donnie Berkholz (dberkholz) @ 2010-04-23 19:09 UTC (permalink / raw
  To: gentoo-commits

dberkholz    10/04/23 19:09:32

  Modified:             charm-6.1.2-r2.ebuild ChangeLog
  Log:
  Fix a typo in src/scripts/Makefile -- bigsim_ooc.h, not bigism_ooc.h.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  sys-cluster/charm/charm-6.1.2-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild?r1=1.4&r2=1.5

Index: charm-6.1.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- charm-6.1.2-r2.ebuild	10 Feb 2010 22:32:10 -0000	1.4
+++ charm-6.1.2-r2.ebuild	23 Apr 2010 19:09:32 -0000	1.5
@@ -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/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.4 2010/02/10 22:32:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.5 2010/04/23 19:09:32 dberkholz Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs flag-o-matic multilib
@@ -31,6 +31,10 @@
 src_prepare() {
 	epatch "${FILESDIR}/${P}-charmrun.patch"
 
+	sed -i \
+		-e "s:bigism_ooc.h:bigsim_ooc.h:" \
+		src/scripts/Makefile || die
+
 	# TCP instead of default UDP for socket comunication
 	# protocol
 	if use tcp; then



1.28                 sys-cluster/charm/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?r1=1.27&r2=1.28

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog	10 Feb 2010 22:32:11 -0000	1.27
+++ ChangeLog	23 Apr 2010 19:09:32 -0000	1.28
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/charm
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.28 2010/04/23 19:09:32 dberkholz Exp $
+
+  23 Apr 2010; Donnie Berkholz <dberkholz@gentoo.org>;
+  charm-6.1.2-r2.ebuild:
+  Fix a typo in src/scripts/Makefile -- bigsim_ooc.h, not bigism_ooc.h.
 
   10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> charm-6.1.2-r2.ebuild:
   Fix poppler depend.






^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-04-23 19:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-23 19:09 [gentoo-commits] gentoo-x86 commit in sys-cluster/charm: charm-6.1.2-r2.ebuild ChangeLog Donnie Berkholz (dberkholz)
  -- strict thread matches above, loose matches on Subject: below --
2010-02-10 22:32 Samuli Suominen (ssuominen)
2009-11-27  8:49 Jeffrey Gardner (je_fro)
2009-11-27  5:26 Jeffrey Gardner (je_fro)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox