[gentoo-commits] proj/sci:master commit in: sys-cluster/charm/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-05-30 19:18 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-05-30 19:18 UTC (permalink / raw
  To: gentoo-commits

commit:     339f8c561dd0cef49cf634337c0ad8e0f4d2e141
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Thu May 30 19:18:43 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu May 30 19:18:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=339f8c56

Added examples use flag.

Package-Manager: portage-2.2.0_alpha177

---
 sys-cluster/charm/ChangeLog          |  3 +++
 sys-cluster/charm/charm-6.5.0.ebuild | 20 +++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 1c91048..714fe3e 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
+  Added examples use flag.
+
 *charm-6.5.0 (30 May 2013)
 
   30 May 2013; Nicolas Bock <nicolasbock@gmail.com> +charm-6.5.0.ebuild,

diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
index a43c91a..fc166c2 100644
--- a/sys-cluster/charm/charm-6.5.0.ebuild
+++ b/sys-cluster/charm/charm-6.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
 LICENSE="charm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cmkopt charmshared tcp smp doc"
+IUSE="cmkopt charmshared tcp smp doc examples"
 
 DEPEND="
 	doc? (
@@ -146,14 +146,16 @@ src_install() {
 	dodoc CHANGES README
 
 	# 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++/*
+	if use examples; then
+		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++/*
+	fi
 
 	# Install pdf/html docs
 	if use doc; then


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-05-30 21:40 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-05-30 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     84f597ed114eecfcadb14f2a82ebcd15e7c92d41
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Thu May 30 21:40:45 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu May 30 21:40:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=84f597ed

More cleanup. Beautify!

Package-Manager: portage-2.2.0_alpha177

---
 sys-cluster/charm/ChangeLog          |  4 ++
 sys-cluster/charm/charm-6.5.0.ebuild | 86 ++++++++++++++++--------------------
 sys-cluster/charm/metadata.xml       |  1 -
 3 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 714fe3e..47d1f7d 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild,
+  metadata.xml:
+  More cleanup. Beautify!
+
   30 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
   Added examples use flag.
 

diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
index fc166c2..c31cea5 100644
--- a/sys-cluster/charm/charm-6.5.0.ebuild
+++ b/sys-cluster/charm/charm-6.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
 LICENSE="charm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cmkopt charmshared tcp smp doc examples"
+IUSE="cmkopt doc examples smp static-libs tcp"
 
 DEPEND="
 	doc? (
@@ -22,31 +22,23 @@ DEPEND="
 	virtual/tex-base )"
 RDEPEND=""
 
-case ${ARCH} in
-	x86)
-		CHARM_ARCH="net-linux" ;;
-
-	amd64)
-		CHARM_ARCH="net-linux-amd64" ;;
-esac
-
 FORTRAN_STANDARD="90"
 
 src_prepare() {
 	#epatch "${FILESDIR}"/${P}-gcc-4.7.patch
 
 	# For production, disable debugging features.
-	CHARM_OPTS="--with-production"
+	CHARM_OPTS="--with-production --build-shared"
 
 	# TCP instead of default UDP for socket comunication
 	# protocol
 	if use tcp; then
-		CHARM_OPTS="${CHARM_OPTS} tcp"
+		CHARM_OPTS+=" tcp"
 	fi
 
 	# enable direct SMP support using shared memory
 	if use smp; then
-		CHARM_OPTS="${CHARM_OPTS} smp"
+		CHARM_OPTS+=" smp"
 	fi
 
 	# CMK optimization
@@ -55,24 +47,24 @@ src_prepare() {
 	fi
 
 	sed \
-		-e "/CMK_CF90/s:f90:${FC}:g" \
+		-e "/CMK_CF90/s:f90:$(tc-getFC):g" \
 		-e "/CMK_CXX/s:g++:$(tc-getCXX):g" \
 		-e "/CMK_CC/s:gcc:$(tc-getCC):g" \
 		-e '/CMK_F90_MODINC/s:-p:-I:g' \
 		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-		-i src/arch/net-linux*/*sh
+		-i src/arch/net-linux*/*sh || die
 
 	sed \
-		-e "s:\(-o conv-cpm\):${LDFLAGS} \1:g" \
-		-e "s:\(-o charmxi\):${LDFLAGS} \1:g" \
-		-e "s:\(-o charmrun-silent\):${LDFLAGS} \1:g" \
-		-e "s:\(-o charmrun-notify\):${LDFLAGS} \1:g" \
-		-e "s:\(-o charmrun\):${LDFLAGS} \1:g" \
-		-e "s:\(-o charmd_faceless\):${LDFLAGS} \1:g" \
-		-e "s:\(-o charmd\):${LDFLAGS} \1:g" \
+		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
+		-e "s:-o charmxi:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
+		-e "s:-o charmrun:${LDFLAGS} &:g" \
+		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
+		-e "s:-o charmd:${LDFLAGS} &:g" \
 		-i \
 		src/scripts/Makefile \
-		src/arch/net/charmrun/Makefile
+		src/arch/net/charmrun/Makefile || die
 
 	append-cflags -DALLOCA_H
 
@@ -81,7 +73,7 @@ src_prepare() {
 
 src_compile() {
 	# build charmm++ first
-	./build charm++ ${CHARM_ARCH} ${CHARM_OPTS} ${MAKEOPTS} ${CFLAGS} || \
+	./build charm++ net-linux$( use amd64 && echo "-amd64" ) ${CHARM_OPTS} ${MAKEOPTS} ${CFLAGS} || \
 		die "Failed to build charm++"
 
 	# make charmc play well with gentoo before
@@ -104,43 +96,43 @@ src_install() {
 	# In the following, some of the files are symlinks to ../tmp which we need
 	# to dereference first (see bug 432834).
 
+	local i
+
 	# Install binaries.
 	for i in bin/*; do
-		if [ -L $i ]; then
-			i=$( readlink -e $i )
-		else
-			i=$i
+		if [[ -L ${i} ]]; then
+			i=$( readlink -e "${i}" ) || die
 		fi
-		dobin $i
+		dobin "${i}"
 	done
 
 	# Install headers.
 	insinto /usr/include/${P}
 	for i in include/*; do
-		if [ -L $i ]; then
-			i=$( readlink -e $i )
-		else
-			i=$i
+		if [[ -L ${i} ]]; then
+			i=$( readlink -e "${i}" ) || die
 		fi
-		doins $i
+		doins "${i}"
 	done
 
-	# Install static libs.  Charm has a lot of .o "libs" that it requires at
+	# Install static libs. Charm has a lot of .o "libs" that it requires at
 	# runtime.
-	for i in lib/*.{a,o}; do
-		if [ -L $i ]; then
-			i=$( readlink -e $i )
-		else
-			i=$i
-		fi
-		dolib $i
-	done
+	if use static-libs; then
+		for i in lib/*.{a,o}; do
+			if [[ -L ${i} ]]; then
+				i=$( readlink -e "${i}" ) || die
+			fi
+			dolib "${i}"
+		done
+	fi
 
 	# Install shared libs.
-	if use charmshared; then
-		cd "${S}"/lib_so
-		dolib.so *.so*
-	fi
+	for i in lib_so/*; do
+		if [[ -L ${i} ]]; then
+			i=$( readlink -e "${i}" ) || die
+		fi
+		dolib.so "${i}"
+	done
 
 	# Basic docs.
 	dodoc CHANGES README
@@ -170,9 +162,7 @@ src_install() {
 }
 
 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
 }

diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
index 715027f..f555a9f 100644
--- a/sys-cluster/charm/metadata.xml
+++ b/sys-cluster/charm/metadata.xml
@@ -5,6 +5,5 @@
 	<use>
 		<flag name="cmkopt">Enable CMK optimisation</flag>
 		<flag name="tcp">Use TCP (instead of UPD) for socket communication</flag>
-		<flag name="charmshared">Build shared libraries</flag>
 	</use>
 </pkgmetadata>


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-05-31  4:33 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-05-31  4:33 UTC (permalink / raw
  To: gentoo-commits

commit:     4232b7ca81e3ff1160a0e4164ea61b825bc2e273
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Fri May 31 03:41:01 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri May 31 03:41:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4232b7ca

The "-DALLOCA_H" compiler flag appears to be unnecessary...

Package-Manager: portage-2.2.0_alpha177

---
 sys-cluster/charm/ChangeLog          | 3 +++
 sys-cluster/charm/charm-6.5.0.ebuild | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 47d1f7d..d09a18b 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
+  The "-DALLOCA_H" compiler flag appears to be unnecessary...
+
   30 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild,
   metadata.xml:
   More cleanup. Beautify!

diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
index c31cea5..d387966 100644
--- a/sys-cluster/charm/charm-6.5.0.ebuild
+++ b/sys-cluster/charm/charm-6.5.0.ebuild
@@ -66,9 +66,7 @@ src_prepare() {
 		src/scripts/Makefile \
 		src/arch/net/charmrun/Makefile || die
 
-	append-cflags -DALLOCA_H
-
-	echo "charm opts: ${CHARM_OPTS}"
+	einfo "charm opts: ${CHARM_OPTS}"
 }
 
 src_compile() {


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-05-31  4:33 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-05-31  4:33 UTC (permalink / raw
  To: gentoo-commits

commit:     6b909bf77399f06a8c71b07134a1aee44672c679
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Fri May 31 04:33:31 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri May 31 04:33:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6b909bf7

Added src_test().

Package-Manager: portage-2.2.0_alpha177

---
 sys-cluster/charm/ChangeLog          |  3 +++
 sys-cluster/charm/charm-6.5.0.ebuild | 13 ++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index d09a18b..2a37b6c 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   31 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
+  Added src_test().
+
+  31 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
   The "-DALLOCA_H" compiler flag appears to be unnecessary...
 
   30 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild,

diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
index d387966..3d6c871 100644
--- a/sys-cluster/charm/charm-6.5.0.ebuild
+++ b/sys-cluster/charm/charm-6.5.0.ebuild
@@ -70,14 +70,10 @@ src_prepare() {
 }
 
 src_compile() {
-	# build charmm++ first
+	# Build charmm++ first.
 	./build charm++ net-linux$( use amd64 && echo "-amd64" ) ${CHARM_OPTS} ${MAKEOPTS} ${CFLAGS} || \
 		die "Failed to build charm++"
 
-	# make charmc play well with gentoo before
-	# we move it into /usr/bin
-	epatch "${FILESDIR}/charm-6.5.0-charmc-gentoo.patch"
-
 	# make pdf/html docs
 	if use doc; then
 		cd "${S}"/doc
@@ -85,7 +81,14 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	make -C tests/charm++ test TESTOPTS="++local"
+}
+
 src_install() {
+	# Make charmc play well with gentoo before we move it into /usr/bin.
+	epatch "${FILESDIR}/charm-6.5.0-charmc-gentoo.patch"
+
 	sed -e "s|gentoo-include|${P}|" \
 		-e "s|gentoo-libdir|$(get_libdir)|g" \
 		-e "s|VERSION|${P}/VERSION|" \


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-05-31 15:30 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-05-31 15:30 UTC (permalink / raw
  To: gentoo-commits

commit:     0eab234b2cadc7a81e811b9276c928f4e0c3b205
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Fri May 31 15:30:25 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri May 31 15:30:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0eab234b

Added die to test.

Package-Manager: portage-2.2.0_alpha177

---
 sys-cluster/charm/ChangeLog          | 3 +++
 sys-cluster/charm/charm-6.5.0.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 2a37b6c..36cf321 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   31 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
+  Added die to test.
+
+  31 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
   Added src_test().
 
   31 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:

diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
index 3d6c871..e798d1e 100644
--- a/sys-cluster/charm/charm-6.5.0.ebuild
+++ b/sys-cluster/charm/charm-6.5.0.ebuild
@@ -82,7 +82,7 @@ src_compile() {
 }
 
 src_test() {
-	make -C tests/charm++ test TESTOPTS="++local"
+	make -C tests/charm++ test TESTOPTS="++local" || die
 }
 
 src_install() {


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-06-06 15:57 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-06-06 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     4035cbb8e5ba1e29440634b0cb256e5583e9c02c
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Thu Jun  6 02:48:15 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu Jun  6 02:48:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4035cbb8

Added USE flag for building the charmdebugger.

---
 sys-cluster/charm/charm-6.5.0.ebuild | 16 +++++++++++-----
 sys-cluster/charm/metadata.xml       |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
index e798d1e..8ae5bec 100644
--- a/sys-cluster/charm/charm-6.5.0.ebuild
+++ b/sys-cluster/charm/charm-6.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
 LICENSE="charm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cmkopt doc examples smp static-libs tcp"
+IUSE="charmdebug cmkopt doc examples smp static-libs tcp"
 
 DEPEND="
 	doc? (
@@ -22,13 +22,19 @@ DEPEND="
 	virtual/tex-base )"
 RDEPEND=""
 
+REQUIRED_USE="charmdebug? ( !cmkopt )"
+
 FORTRAN_STANDARD="90"
 
 src_prepare() {
-	#epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+	# Build shared libraries by default.
+	CHARM_OPTS="--build-shared"
 
-	# For production, disable debugging features.
-	CHARM_OPTS="--with-production --build-shared"
+	if use charmdebug; then
+		CHARM_OPTS+=" --with-charmdebug"
+	else
+		CHARM_OPTS+=" --with-production"
+	fi
 
 	# TCP instead of default UDP for socket comunication
 	# protocol
@@ -43,7 +49,7 @@ src_prepare() {
 
 	# CMK optimization
 	if use cmkopt; then
-		append-flags -DCMK_OPTIMIZE=1
+		append-cppflags -DCMK_OPTIMIZE=1
 	fi
 
 	sed \

diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
index f555a9f..37dbe45 100644
--- a/sys-cluster/charm/metadata.xml
+++ b/sys-cluster/charm/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>sci</herd>
 	<use>
+		<flag name="charmdebug">Enable the charm debugger</flag>
 		<flag name="cmkopt">Enable CMK optimisation</flag>
 		<flag name="tcp">Use TCP (instead of UPD) for socket communication</flag>
 	</use>


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-06-24 21:33 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-06-24 21:33 UTC (permalink / raw
  To: gentoo-commits

commit:     4e869c9c397e0ba34f42322165e37a0dce43cdb5
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Mon Jun 24 21:32:55 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Mon Jun 24 21:32:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4e869c9c

sys-cluster/charm-6.5.0: Added mpi use flag.

Package-Manager: portage-2.2.0_alpha184

---
 sys-cluster/charm/ChangeLog          |  3 +++
 sys-cluster/charm/charm-6.5.0.ebuild | 22 +++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 36cf321..f55bfa5 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Jun 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
+  sys-cluster/charm-6.5.0: Added mpi use flag.
+
   31 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
   Added die to test.
 

diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
index 8ae5bec..3049b62 100644
--- a/sys-cluster/charm/charm-6.5.0.ebuild
+++ b/sys-cluster/charm/charm-6.5.0.ebuild
@@ -13,14 +13,18 @@ SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
 LICENSE="charm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="charmdebug cmkopt doc examples smp static-libs tcp"
+IUSE="charmdebug cmkopt doc examples mpi smp static-libs tcp"
 
 DEPEND="
 	doc? (
 	>=app-text/poppler-0.12.3-r3[utils]
 	dev-tex/latex2html
-	virtual/tex-base )"
-RDEPEND=""
+	virtual/tex-base )
+	mpi? (
+	virtual/mpi )"
+RDEPEND="
+	mpi? (
+	virtual/mpi )"
 
 REQUIRED_USE="charmdebug? ( !cmkopt )"
 
@@ -53,12 +57,12 @@ src_prepare() {
 	fi
 
 	sed \
-		-e "/CMK_CF90/s:f90:$(tc-getFC):g" \
-		-e "/CMK_CXX/s:g++:$(tc-getCXX):g" \
-		-e "/CMK_CC/s:gcc:$(tc-getCC):g" \
+		-e "/CMK_CF90/s:f90:$( use mpi && echo "mpif90" || echo $(tc-getFC)):g" \
+		-e "/CMK_CXX/s:g++:$( use mpi && echo "mpic++" || echo $(tc-getCXX)):g" \
+		-e "/CMK_CC/s:gcc:$( use mpi && echo "mpicc" || echo $(tc-getCC)):g" \
 		-e '/CMK_F90_MODINC/s:-p:-I:g' \
 		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-		-i src/arch/net-linux*/*sh || die
+		-i src/arch/$( use mpi && echo "mpi" || echo "net" )-linux*/*sh || die
 
 	sed \
 		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
@@ -77,8 +81,8 @@ src_prepare() {
 
 src_compile() {
 	# Build charmm++ first.
-	./build charm++ net-linux$( use amd64 && echo "-amd64" ) ${CHARM_OPTS} ${MAKEOPTS} ${CFLAGS} || \
-		die "Failed to build charm++"
+	./build charm++ $( use mpi && echo "mpi" || echo "net" )-linux$( use amd64 && echo "-amd64" ) \
+		${CHARM_OPTS} ${MAKEOPTS} ${CFLAGS} || die "Failed to build charm++"
 
 	# make pdf/html docs
 	if use doc; then


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-06-24 21:43 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-06-24 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     5441c94cded9b0e732d3fc7168c30ac732a2d963
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Mon Jun 24 21:43:05 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Mon Jun 24 21:43:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5441c94c

sys-cluster/charm-6.5.0: Reorganized DEPENDs.

Package-Manager: portage-2.2.0_alpha184

---
 sys-cluster/charm/ChangeLog          |  3 +++
 sys-cluster/charm/charm-6.5.0.ebuild | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index f55bfa5..d5714c9 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   24 Jun 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
+  sys-cluster/charm-6.5.0: Reorganized DEPENDs.
+
+  24 Jun 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
   sys-cluster/charm-6.5.0: Added mpi use flag.
 
   31 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:

diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
index 3049b62..6eb6c31 100644
--- a/sys-cluster/charm/charm-6.5.0.ebuild
+++ b/sys-cluster/charm/charm-6.5.0.ebuild
@@ -15,16 +15,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="charmdebug cmkopt doc examples mpi smp static-libs tcp"
 
+MPIDEPEND="
+	mpi? (
+	virtual/mpi )"
 DEPEND="
 	doc? (
 	>=app-text/poppler-0.12.3-r3[utils]
 	dev-tex/latex2html
 	virtual/tex-base )
-	mpi? (
-	virtual/mpi )"
-RDEPEND="
-	mpi? (
-	virtual/mpi )"
+	${MPIDEPEND}"
+RDEPEND="${MPIDEPEND}"
 
 REQUIRED_USE="charmdebug? ( !cmkopt )"
 


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-06-26  5:04 Christoph Junghans
  0 siblings, 0 replies; 30+ messages in thread
From: Christoph Junghans @ 2013-06-26  5:04 UTC (permalink / raw
  To: gentoo-commits

commit:     b12efc5dd84b2c0c6ea5f11e6a469f970d97b714
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 04:43:02 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 04:43:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b12efc5d

make use of usex

Package-Manager: portage-2.2.0_alpha185

---
 sys-cluster/charm/ChangeLog          |  3 +++
 sys-cluster/charm/charm-6.5.0.ebuild | 51 ++++++++++++++----------------------
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index d5714c9..c7d2825 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Jun 2013; Christoph Junghans <ottxor@gentoo.org> charm-6.5.0.ebuild:
+  make use of usex
+
   24 Jun 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
   sys-cluster/charm-6.5.0: Reorganized DEPENDs.
 

diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
index 6eb6c31..a6a6545 100644
--- a/sys-cluster/charm/charm-6.5.0.ebuild
+++ b/sys-cluster/charm/charm-6.5.0.ebuild
@@ -15,16 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="charmdebug cmkopt doc examples mpi smp static-libs tcp"
 
-MPIDEPEND="
-	mpi? (
-	virtual/mpi )"
+RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="
+	${RDEPEND}
 	doc? (
-	>=app-text/poppler-0.12.3-r3[utils]
-	dev-tex/latex2html
-	virtual/tex-base )
-	${MPIDEPEND}"
-RDEPEND="${MPIDEPEND}"
+		>=app-text/poppler-0.12.3-r3[utils]
+		dev-tex/latex2html
+		virtual/tex-base
+	)"
 
 REQUIRED_USE="charmdebug? ( !cmkopt )"
 
@@ -33,36 +31,25 @@ FORTRAN_STANDARD="90"
 src_prepare() {
 	# Build shared libraries by default.
 	CHARM_OPTS="--build-shared"
-
-	if use charmdebug; then
-		CHARM_OPTS+=" --with-charmdebug"
-	else
-		CHARM_OPTS+=" --with-production"
-	fi
+	CHARM_OPTS+=" --with-$(usex charmdebug charmdebug production)"
 
 	# TCP instead of default UDP for socket comunication
 	# protocol
-	if use tcp; then
-		CHARM_OPTS+=" tcp"
-	fi
+	CHARM_OPTS+="$(usex tcp ' tcp' '')"
 
 	# enable direct SMP support using shared memory
-	if use smp; then
-		CHARM_OPTS+=" smp"
-	fi
+	CHARM_OPTS+="$(usex smp ' smp' '')"
 
 	# CMK optimization
-	if use cmkopt; then
-		append-cppflags -DCMK_OPTIMIZE=1
-	fi
+	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
 
 	sed \
-		-e "/CMK_CF90/s:f90:$( use mpi && echo "mpif90" || echo $(tc-getFC)):g" \
-		-e "/CMK_CXX/s:g++:$( use mpi && echo "mpic++" || echo $(tc-getCXX)):g" \
-		-e "/CMK_CC/s:gcc:$( use mpi && echo "mpicc" || echo $(tc-getCC)):g" \
+		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
+		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
 		-e '/CMK_F90_MODINC/s:-p:-I:g' \
 		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-		-i src/arch/$( use mpi && echo "mpi" || echo "net" )-linux*/*sh || die
+		-i src/arch/$(usex mpi && "mpi" "net")-linux*/*sh || die
 
 	sed \
 		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
@@ -81,7 +68,7 @@ src_prepare() {
 
 src_compile() {
 	# Build charmm++ first.
-	./build charm++ $( use mpi && echo "mpi" || echo "net" )-linux$( use amd64 && echo "-amd64" ) \
+	./build charm++ $(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') \
 		${CHARM_OPTS} ${MAKEOPTS} ${CFLAGS} || die "Failed to build charm++"
 
 	# make pdf/html docs
@@ -112,7 +99,7 @@ src_install() {
 	# Install binaries.
 	for i in bin/*; do
 		if [[ -L ${i} ]]; then
-			i=$( readlink -e "${i}" ) || die
+			i=$(readlink -e "${i}") || die
 		fi
 		dobin "${i}"
 	done
@@ -121,7 +108,7 @@ src_install() {
 	insinto /usr/include/${P}
 	for i in include/*; do
 		if [[ -L ${i} ]]; then
-			i=$( readlink -e "${i}" ) || die
+			i=$(readlink -e "${i}") || die
 		fi
 		doins "${i}"
 	done
@@ -131,7 +118,7 @@ src_install() {
 	if use static-libs; then
 		for i in lib/*.{a,o}; do
 			if [[ -L ${i} ]]; then
-				i=$( readlink -e "${i}" ) || die
+				i=$(readlink -e "${i}") || die
 			fi
 			dolib "${i}"
 		done
@@ -140,7 +127,7 @@ src_install() {
 	# Install shared libs.
 	for i in lib_so/*; do
 		if [[ -L ${i} ]]; then
-			i=$( readlink -e "${i}" ) || die
+			i=$(readlink -e "${i}") || die
 		fi
 		dolib.so "${i}"
 	done


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-06-26 20:38 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-06-26 20:38 UTC (permalink / raw
  To: gentoo-commits

commit:     15a39cf4f53ceb7d4ad222f2bbeba859b4677433
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Wed Jun 26 20:38:05 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Wed Jun 26 20:38:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=15a39cf4

Added new package: projections

A performance analysis framework for Charm++ applications

Package-Manager: portage-2.2.0_alpha185

---
 sys-cluster/charm/ChangeLog          |  5 +++++
 sys-cluster/charm/charm-6.5.0.ebuild | 16 +++++++++++++---
 sys-cluster/charm/metadata.xml       |  2 ++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index c7d2825..6ad5879 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Jun 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild,
+  metadata.xml:
+  Added new package: projections  A performance analysis framework for Charm++
+  applications
+
   26 Jun 2013; Christoph Junghans <ottxor@gentoo.org> charm-6.5.0.ebuild:
   make use of usex
 

diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
index a6a6545..e4a8f4e 100644
--- a/sys-cluster/charm/charm-6.5.0.ebuild
+++ b/sys-cluster/charm/charm-6.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
 LICENSE="charm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="charmdebug cmkopt doc examples mpi smp static-libs tcp"
+IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mpi smp static-libs tcp"
 
 RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="
@@ -31,7 +31,17 @@ FORTRAN_STANDARD="90"
 src_prepare() {
 	# Build shared libraries by default.
 	CHARM_OPTS="--build-shared"
-	CHARM_OPTS+=" --with-$(usex charmdebug charmdebug production)"
+	if use charmproduction; then
+		CHARM_OPTS+=" --with-production"
+	else
+		if use charmdebug; then
+			CHARM_OPTS+=" --with-charmdebug"
+		fi
+
+		if use charmtracing; then
+			CHARM_OPTS+=" --with-tracing --with-tracing-commthread"
+		fi
+	fi
 
 	# TCP instead of default UDP for socket comunication
 	# protocol
@@ -49,7 +59,7 @@ src_prepare() {
 		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
 		-e '/CMK_F90_MODINC/s:-p:-I:g' \
 		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-		-i src/arch/$(usex mpi && "mpi" "net")-linux*/*sh || die
+		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
 
 	sed \
 		-e "s:-o conv-cpm:${LDFLAGS} &:g" \

diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
index 37dbe45..0e4959d 100644
--- a/sys-cluster/charm/metadata.xml
+++ b/sys-cluster/charm/metadata.xml
@@ -4,6 +4,8 @@
 	<herd>sci</herd>
 	<use>
 		<flag name="charmdebug">Enable the charm debugger</flag>
+		<flag name="charmproduction">Optimize performance of Charm++ runtime</flag>
+		<flag name="charmtracing">Enable tracing support in Charm++</flag>
 		<flag name="cmkopt">Enable CMK optimisation</flag>
 		<flag name="tcp">Use TCP (instead of UPD) for socket communication</flag>
 	</use>


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-06-26 21:55 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-06-26 21:55 UTC (permalink / raw
  To: gentoo-commits

commit:     78df02dfa4160df597b4c2246bb3ea5a433eacba
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Wed Jun 26 21:53:48 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Wed Jun 26 21:53:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=78df02df

Beautify.

Package-Manager: portage-2.2.0_alpha185

---
 sys-cluster/charm/ChangeLog          | 3 +++
 sys-cluster/charm/charm-6.5.0.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 6ad5879..dce9f9f 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Jun 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
+  Beautify.
+
   26 Jun 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild,
   metadata.xml:
   Added new package: projections  A performance analysis framework for Charm++

diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
index e4a8f4e..9b34899 100644
--- a/sys-cluster/charm/charm-6.5.0.ebuild
+++ b/sys-cluster/charm/charm-6.5.0.ebuild
@@ -24,7 +24,9 @@ DEPEND="
 		virtual/tex-base
 	)"
 
-REQUIRED_USE="charmdebug? ( !cmkopt )"
+REQUIRED_USE="
+	cmkopt? ( !charmdebug !charmtracing )
+	charmproduction? ( !charmdebug !charmtracing )"
 
 FORTRAN_STANDARD="90"
 


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-07-02  3:32 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-07-02  3:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ad69795e376835bb60569f8d6207c5776edefdcb
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Tue Jul  2 03:32:33 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Jul  2 03:32:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ad69795e

Version bump to sys-cluster/charm-6.5.1

Package-Manager: portage-2.2.0_alpha186

---
 sys-cluster/charm/ChangeLog          |   9 ++
 sys-cluster/charm/charm-6.5.1.ebuild | 178 +++++++++++++++++++++++++++++++++++
 sys-cluster/charm/metadata.xml       |  15 +++
 3 files changed, 202 insertions(+)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
new file mode 100644
index 0000000..3563efb
--- /dev/null
+++ b/sys-cluster/charm/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for sys-cluster/charm
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*charm-6.5.1 (02 Jul 2013)
+
+  02 Jul 2013; Nicolas Bock <nicolasbock@gmail.com> +charm-6.5.1.ebuild,
+  +metadata.xml:
+  Version bump to sys-cluster/charm-6.5.1

diff --git a/sys-cluster/charm/charm-6.5.1.ebuild b/sys-cluster/charm/charm-6.5.1.ebuild
new file mode 100644
index 0000000..25982f8
--- /dev/null
+++ b/sys-cluster/charm/charm-6.5.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
+
+DESCRIPTION="Message-passing parallel language and runtime system"
+HOMEPAGE="http://charm.cs.uiuc.edu/"
+SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
+
+LICENSE="charm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mpi smp static-libs tcp"
+
+RDEPEND="mpi? ( virtual/mpi )"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		>=app-text/poppler-0.12.3-r3[utils]
+		dev-tex/latex2html
+		virtual/tex-base
+	)"
+
+REQUIRED_USE="
+	cmkopt? ( !charmdebug !charmtracing )
+	charmproduction? ( !charmdebug !charmtracing )"
+
+FORTRAN_STANDARD="90"
+
+src_prepare() {
+	# Build shared libraries by default.
+	CHARM_OPTS="--build-shared"
+	if use charmproduction; then
+		CHARM_OPTS+=" --with-production"
+	else
+		if use charmdebug; then
+			CHARM_OPTS+=" --with-charmdebug"
+		fi
+
+		if use charmtracing; then
+			CHARM_OPTS+=" --with-tracing --with-tracing-commthread"
+		fi
+	fi
+
+	# TCP instead of default UDP for socket comunication
+	# protocol
+	CHARM_OPTS+="$(usex tcp ' tcp' '')"
+
+	# enable direct SMP support using shared memory
+	CHARM_OPTS+="$(usex smp ' smp' '')"
+
+	# CMK optimization
+	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
+
+	sed \
+		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
+		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
+		-e '/CMK_F90_MODINC/s:-p:-I:g' \
+		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
+		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
+
+	sed \
+		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
+		-e "s:-o charmxi:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
+		-e "s:-o charmrun:${LDFLAGS} &:g" \
+		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
+		-e "s:-o charmd:${LDFLAGS} &:g" \
+		-i \
+		src/scripts/Makefile \
+		src/arch/net/charmrun/Makefile || die
+
+	einfo "charm opts: ${CHARM_OPTS}"
+}
+
+src_compile() {
+	# Build charmm++ first.
+	./build charm++ $(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') \
+		${CHARM_OPTS} ${MAKEOPTS} ${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_test() {
+	make -C tests/charm++ test TESTOPTS="++local" || die
+}
+
+src_install() {
+	# Make charmc play well with gentoo before we move it into /usr/bin.
+	epatch "${FILESDIR}/charm-6.5.0-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"
+
+	# In the following, some of the files are symlinks to ../tmp which we need
+	# to dereference first (see bug 432834).
+
+	local i
+
+	# Install binaries.
+	for i in bin/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dobin "${i}"
+	done
+
+	# Install headers.
+	insinto /usr/include/${P}
+	for i in include/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		doins "${i}"
+	done
+
+	# Install static libs. Charm has a lot of .o "libs" that it requires at
+	# runtime.
+	if use static-libs; then
+		for i in lib/*.{a,o}; do
+			if [[ -L ${i} ]]; then
+				i=$(readlink -e "${i}") || die
+			fi
+			dolib "${i}"
+		done
+	fi
+
+	# Install shared libs.
+	for i in lib_so/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dolib.so "${i}"
+	done
+
+	# Basic docs.
+	dodoc CHANGES README
+
+	# Install examples.
+	if use examples; then
+		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++/*
+	fi
+
+	# Install pdf/html docs
+	if use doc; then
+		cd "${S}"/doc
+		# Install pdfs.
+		insinto /usr/share/doc/${PF}/pdf
+		doins  doc/pdf/*
+		# Install html.
+		docinto html
+		dohtml -r doc/html/*
+	fi
+}
+
+pkg_postinst() {
+	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'."
+}

diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
new file mode 100644
index 0000000..ea5896e
--- /dev/null
+++ b/sys-cluster/charm/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci</herd>
+	<maintainer>
+		<email>nicolasbock@gmail.com</email>
+	</maintainer>
+	<use>
+		<flag name="charmdebug">Enable the charm debugger</flag>
+		<flag name="charmproduction">Optimize performance of Charm++ runtime</flag>
+		<flag name="charmtracing">Enable tracing support in Charm++</flag>
+		<flag name="cmkopt">Enable CMK optimisation</flag>
+		<flag name="tcp">Use TCP (instead of UPD) for socket communication</flag>
+	</use>
+</pkgmetadata>


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-07-03 16:41 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-07-03 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     f13640f929310b6fc3e4bf27be55580957e8eb54
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Wed Jul  3 16:40:14 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Wed Jul  3 16:40:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f13640f9

Added more use flags, and fixed a few typos.

Package-Manager: portage-2.2.0_alpha186

---
 sys-cluster/charm/ChangeLog          |  4 ++++
 sys-cluster/charm/charm-6.5.1.ebuild | 46 ++++++++++++++++++++++--------------
 sys-cluster/charm/metadata.xml       |  3 +++
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 4d51c0e..6c74582 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Jul 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.1.ebuild,
+  metadata.xml:
+  Added more use flags, and fixed a few typos.
+
   02 Jul 2013; Nicolas Bock <nicolasbock@gmail.com>
   +files/charm-6.5.0-charmc-gentoo.patch, charm-6.5.1.ebuild:
   Added missing patch.

diff --git a/sys-cluster/charm/charm-6.5.1.ebuild b/sys-cluster/charm/charm-6.5.1.ebuild
index 74ba894..5172428 100644
--- a/sys-cluster/charm/charm-6.5.1.ebuild
+++ b/sys-cluster/charm/charm-6.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
 LICENSE="charm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mpi smp static-libs tcp"
+IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
 
 RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="
@@ -30,31 +30,39 @@ REQUIRED_USE="
 
 FORTRAN_STANDARD="90"
 
-src_prepare() {
+get_opts() {
+	local CHARM_OPTS
+
+	# TCP instead of default UDP for socket comunication
+	# protocol
+	CHARM_OPTS+="$(usex tcp ' tcp' '')"
+
+	# enable direct SMP support using shared memory
+	CHARM_OPTS+="$(usex smp ' smp' '')"
+
+	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
+	CHARM_OPTS+="$(usex syncft ' syncft' '')"
+
 	# Build shared libraries by default.
-	CHARM_OPTS="--build-shared"
+	CHARM_OPTS+=" --build-shared"
+
 	if use charmproduction; then
 		CHARM_OPTS+=" --with-production"
 	else
 		if use charmdebug; then
-			CHARM_OPTS+=" --with-charmdebug"
+			CHARM_OPTS+=" --enable-charmdebug"
 		fi
 
 		if use charmtracing; then
-			CHARM_OPTS+=" --with-tracing --with-tracing-commthread"
+			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
 		fi
 	fi
 
-	# TCP instead of default UDP for socket comunication
-	# protocol
-	CHARM_OPTS+="$(usex tcp ' tcp' '')"
-
-	# enable direct SMP support using shared memory
-	CHARM_OPTS+="$(usex smp ' smp' '')"
-
-	# CMK optimization
-	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
+	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
+	echo $CHARM_OPTS
+}
 
+src_prepare() {
 	sed \
 		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
 		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
@@ -75,16 +83,18 @@ src_prepare() {
 		src/scripts/Makefile \
 		src/arch/net/charmrun/Makefile || die
 
-	# Fix QA notice.
-	append-cflags -DALLOCA_H
+	# CMK optimization
+	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
 
-	einfo "charm opts: ${CHARM_OPTS}"
+	# Fix QA notice. Filed report with upstream.
+	append-cflags -DALLOCA_H
 }
 
 src_compile() {
 	# Build charmm++ first.
+	einfo "running ./build charm++ $(usex mpi 'mpi' 'net')-linux$(usex amd64 '-amd64' '') $(get_opts) ${MAKEOPTS} ${CFLAGS}"
 	./build charm++ $(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') \
-		${CHARM_OPTS} ${MAKEOPTS} ${CFLAGS} || die "Failed to build charm++"
+		$(get_opts) ${MAKEOPTS} ${CFLAGS} || die "Failed to build charm++"
 
 	# make pdf/html docs
 	if use doc; then

diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
index ea5896e..9300483 100644
--- a/sys-cluster/charm/metadata.xml
+++ b/sys-cluster/charm/metadata.xml
@@ -10,6 +10,9 @@
 		<flag name="charmproduction">Optimize performance of Charm++ runtime</flag>
 		<flag name="charmtracing">Enable tracing support in Charm++</flag>
 		<flag name="cmkopt">Enable CMK optimisation</flag>
+		<flag name="mlogft">Compile with Charm++ message logging fault tolerance support</flag>
+		<flag name="numa">support memory affinity with NUMA</flag>
+		<flag name="syncft">Compile with Charm++ fault tolerance support</flag>
 		<flag name="tcp">Use TCP (instead of UPD) for socket communication</flag>
 	</use>
 </pkgmetadata>


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-07-03 16:43 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-07-03 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     62808ee46da96ad32fe7541b5dc522a1d500ff64
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Wed Jul  3 16:43:11 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Wed Jul  3 16:43:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=62808ee4

Beautification.

Package-Manager: portage-2.2.0_alpha186

---
 sys-cluster/charm/ChangeLog    | 3 +++
 sys-cluster/charm/metadata.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 6c74582..cb0fdfc 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Jul 2013; Nicolas Bock <nicolasbock@gmail.com> metadata.xml:
+  Beautification.
+
   03 Jul 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.1.ebuild,
   metadata.xml:
   Added more use flags, and fixed a few typos.

diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
index 9300483..8ec82bb 100644
--- a/sys-cluster/charm/metadata.xml
+++ b/sys-cluster/charm/metadata.xml
@@ -11,7 +11,7 @@
 		<flag name="charmtracing">Enable tracing support in Charm++</flag>
 		<flag name="cmkopt">Enable CMK optimisation</flag>
 		<flag name="mlogft">Compile with Charm++ message logging fault tolerance support</flag>
-		<flag name="numa">support memory affinity with NUMA</flag>
+		<flag name="numa">Support memory affinity with NUMA</flag>
 		<flag name="syncft">Compile with Charm++ fault tolerance support</flag>
 		<flag name="tcp">Use TCP (instead of UPD) for socket communication</flag>
 	</use>


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-09-11 17:28 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-09-11 17:28 UTC (permalink / raw
  To: gentoo-commits

commit:     55866eaf45022cc383af4bd549458e6c2a82acc9
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Wed Sep 11 17:28:18 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Wed Sep 11 17:28:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=55866eaf

Version bump to sys-cluster/charm-6.5.1-r1 to push CkMigrationMgr patch to users.

Package-Manager: portage-2.2.1

---
 sys-cluster/charm/ChangeLog                                     | 7 +++++++
 sys-cluster/charm/{charm-6.5.1.ebuild => charm-6.5.1-r1.ebuild} | 0
 sys-cluster/charm/charm-6.5.1.ebuild                            | 1 -
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index f6f824c..61f5a30 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*charm-6.5.1-r1 (11 Sep 2013)
+
+  11 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> +charm-6.5.1-r1.ebuild,
+  charm-6.5.1.ebuild:
+  Version bump to sys-cluster/charm-6.5.1-r1 to push CkMigrationMgr patch to
+  users.
+
   11 Sep 2013; Nicolas Bock <nicolasbock@gmail.com>
   +files/charm-6.5.1-CkReductionMgr.patch, charm-6.5.1.ebuild:
   Added patch to fix bug in CkReductionMgr::reduceMessages().  This issues has

diff --git a/sys-cluster/charm/charm-6.5.1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild
similarity index 100%
copy from sys-cluster/charm/charm-6.5.1.ebuild
copy to sys-cluster/charm/charm-6.5.1-r1.ebuild

diff --git a/sys-cluster/charm/charm-6.5.1.ebuild b/sys-cluster/charm/charm-6.5.1.ebuild
index 9161c8f..5405952 100644
--- a/sys-cluster/charm/charm-6.5.1.ebuild
+++ b/sys-cluster/charm/charm-6.5.1.ebuild
@@ -90,7 +90,6 @@ src_prepare() {
 	append-cflags -DALLOCA_H
 
 	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
-	epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
 }
 
 src_compile() {


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-09-27 17:36 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-09-27 17:36 UTC (permalink / raw
  To: gentoo-commits

commit:     1b5e20210e0d5ca9b5fb022f61d852db17fa2426
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Fri Sep 27 17:34:34 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri Sep 27 17:34:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1b5e2021

sys-cluster/charm-6.5.1-r1: Added another missing DEPEND.

Package-Manager: portage-2.2.1

---
 sys-cluster/charm/ChangeLog             | 3 +++
 sys-cluster/charm/charm-6.5.1-r1.ebuild | 1 +
 2 files changed, 4 insertions(+)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 492cc96..07e5d6a 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.1-r1.ebuild:
+  sys-cluster/charm-6.5.1-r1: Added another missing DEPEND.
+
   27 Sep 2013; Nicolas Bock <nicolasbock@gmail.com>
   +files/charm-6.5.1-charmc-gentoo.patch, charm-6.5.1-r1.ebuild,
   files/charm-6.5.1-CkReductionMgr.patch,

diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild
index 1b7cb1b..11f8beb 100644
--- a/sys-cluster/charm/charm-6.5.1-r1.ebuild
+++ b/sys-cluster/charm/charm-6.5.1-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 		dev-tex/latex2html
 		virtual/tex-base
 		dev-python/beautifulsoup
+		media-libs/netpbm
 	)"
 
 REQUIRED_USE="


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-09-27 18:18 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-09-27 18:18 UTC (permalink / raw
  To: gentoo-commits

commit:     52d9d6e1511cecfe0daf0036f9e31e5ec8f5bade
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Fri Sep 27 18:18:22 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri Sep 27 18:18:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=52d9d6e1

sys-cluster/charm-6.5.1-r1: doc depends on python-2

Package-Manager: portage-2.2.1

---
 sys-cluster/charm/ChangeLog             | 3 +++
 sys-cluster/charm/charm-6.5.1-r1.ebuild | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 07e5d6a..fa7dd1d 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   27 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.1-r1.ebuild:
+  sys-cluster/charm-6.5.1-r1: doc depends on python-2
+
+  27 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.1-r1.ebuild:
   sys-cluster/charm-6.5.1-r1: Added another missing DEPEND.
 
   27 Sep 2013; Nicolas Bock <nicolasbock@gmail.com>

diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild
index 11f8beb..b4e2913 100644
--- a/sys-cluster/charm/charm-6.5.1-r1.ebuild
+++ b/sys-cluster/charm/charm-6.5.1-r1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+PYTHON_DEPEND="doc? 2"
+
 inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
 
 DESCRIPTION="Message-passing parallel language and runtime system"


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-09-27 20:07 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-09-27 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     d6c53b0a3c9f52a30f077536de11332d955312b1
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Fri Sep 27 20:07:13 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri Sep 27 20:07:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d6c53b0a

sys-cluster/charm-6.5.1-r1: Added python dependencies

The documentation is built partly with python2.x scripts. I added the
necessary dependencies.

Package-Manager: portage-2.2.1

---
 sys-cluster/charm/ChangeLog             |  4 ++++
 sys-cluster/charm/charm-6.5.1-r1.ebuild | 22 ++++++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index fa7dd1d..d005b5f 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   27 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.1-r1.ebuild:
+  sys-cluster/charm-6.5.1-r1: Added python dependencies  The documentation is
+  built partly with python2.x scripts. I added the necessary dependencies.
+
+  27 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.1-r1.ebuild:
   sys-cluster/charm-6.5.1-r1: doc depends on python-2
 
   27 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.1-r1.ebuild:

diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild
index b4e2913..d429138 100644
--- a/sys-cluster/charm/charm-6.5.1-r1.ebuild
+++ b/sys-cluster/charm/charm-6.5.1-r1.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=5
 
-PYTHON_DEPEND="doc? 2"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
+inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-single-r1
 
 DESCRIPTION="Message-passing parallel language and runtime system"
 HOMEPAGE="http://charm.cs.uiuc.edu/"
@@ -24,11 +24,13 @@ DEPEND="
 		>=app-text/poppler-0.12.3-r3[utils]
 		dev-tex/latex2html
 		virtual/tex-base
-		dev-python/beautifulsoup
+		>=dev-python/beautifulsoup-4
 		media-libs/netpbm
+		${PYTHON_DEPS}
 	)"
 
 REQUIRED_USE="
+    doc? ( ${PYTHON_REQUIRED_USE} )
 	cmkopt? ( !charmdebug !charmtracing )
 	charmproduction? ( !charmdebug !charmtracing )"
 
@@ -99,15 +101,19 @@ src_prepare() {
 }
 
 src_compile() {
+	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} ${CFLAGS}"
+
 	# Build charmm++ first.
-	einfo "running ./build charm++ $(usex mpi 'mpi' 'net')-linux$(usex amd64 '-amd64' '') $(get_opts) ${MAKEOPTS} ${CFLAGS}"
-	./build charm++ $(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') \
-		$(get_opts) ${MAKEOPTS} ${CFLAGS} || die "Failed to build charm++"
+	einfo "running ./build charm++ ${mybuildoptions}"
+	./build charm++ ${mybuildoptions} || 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"
+		python-single-r1_pkg_setup
+		python_fix_shebang ${S}/doc
+		einfo "forcing ${EPYTHON}"
+		einfo "running ./build doc ${mybuildoptions}"
+		./build doc ${mybuildoptions} || die "Failed to build charm++ documentation"
 	fi
 }
 


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-10-01 15:41 Christoph Junghans
  0 siblings, 0 replies; 30+ messages in thread
From: Christoph Junghans @ 2013-10-01 15:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c7184265dc574a8b44ab9dd9d11e7f2c580794f6
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  1 15:41:43 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 15:41:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c7184265

fixed deps

Package-Manager: portage-2.2.1

---
 sys-cluster/charm/ChangeLog             | 3 +++
 sys-cluster/charm/charm-6.5.1-r1.ebuild | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 21f92a3..e449e4d 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Oct 2013; Christoph Junghans <ottxor@gentoo.org> charm-6.5.1-r1.ebuild:
+  fixed deps
+
   01 Oct 2013; Nicolas Bock <nicolasbock@gmail.com>
   +files/charm-6.5.1-fix-navmenuGenerator.patch, charm-6.5.1-r1.ebuild:
   sys-cluster/charm-6.5.1-r1: Fix docs with -j1  Docs don't build when using

diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild
index 9b027c8..d991995 100644
--- a/sys-cluster/charm/charm-6.5.1-r1.ebuild
+++ b/sys-cluster/charm/charm-6.5.1-r1.ebuild
@@ -24,7 +24,8 @@ DEPEND="
 		>=app-text/poppler-0.12.3-r3[utils]
 		dev-tex/latex2html
 		virtual/tex-base
-		>=dev-python/beautifulsoup-4
+		>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
 		media-libs/netpbm
 		${PYTHON_DEPS}
 	)"


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-10-18 20:33 Christoph Junghans
  0 siblings, 0 replies; 30+ messages in thread
From: Christoph Junghans @ 2013-10-18 20:33 UTC (permalink / raw
  To: gentoo-commits

commit:     55552ad567b8aab6fde2824f7ef75c3e4bcbccbc
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 18 20:33:00 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 20:33:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=55552ad5

remove old

Package-Manager: portage-2.2.1

---
 sys-cluster/charm/ChangeLog             |   4 +
 sys-cluster/charm/charm-6.5.1-r1.ebuild | 208 --------------------------------
 sys-cluster/charm/charm-6.5.1.ebuild    | 193 -----------------------------
 3 files changed, 4 insertions(+), 401 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index e2f228b..ee0e794 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Oct 2013; Christoph Junghans <ottxor@gentoo.org> -charm-6.5.1-r1.ebuild,
+  -charm-6.5.1.ebuild:
+  remove old
+
   15 Oct 2013; Nicolas Bock <nicolasbock@gmail.com>
   files/charm-6.5.1-static-library-fix.patch:
   sys-cluster/charm-6.5.1-r2: Updated static library patch with upstream patch.

diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild
deleted file mode 100644
index d991995..0000000
--- a/sys-cluster/charm/charm-6.5.1-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-single-r1
-
-DESCRIPTION="Message-passing parallel language and runtime system"
-HOMEPAGE="http://charm.cs.uiuc.edu/"
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
-
-LICENSE="charm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		>=app-text/poppler-0.12.3-r3[utils]
-		dev-tex/latex2html
-		virtual/tex-base
-		>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-libs/netpbm
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	doc? ( ${PYTHON_REQUIRED_USE} )
-	cmkopt? ( !charmdebug !charmtracing )
-	charmproduction? ( !charmdebug !charmtracing )"
-
-FORTRAN_STANDARD="90"
-
-get_opts() {
-	local CHARM_OPTS
-
-	# TCP instead of default UDP for socket comunication
-	# protocol
-	CHARM_OPTS+="$(usex tcp ' tcp' '')"
-
-	# enable direct SMP support using shared memory
-	CHARM_OPTS+="$(usex smp ' smp' '')"
-
-	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
-	CHARM_OPTS+="$(usex syncft ' syncft' '')"
-
-	# Build shared libraries by default.
-	CHARM_OPTS+=" --build-shared"
-
-	if use charmproduction; then
-		CHARM_OPTS+=" --with-production"
-	else
-		if use charmdebug; then
-			CHARM_OPTS+=" --enable-charmdebug"
-		fi
-
-		if use charmtracing; then
-			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
-		fi
-	fi
-
-	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
-	echo $CHARM_OPTS
-}
-
-src_prepare() {
-	sed \
-		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
-		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
-		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
-		-e '/CMK_F90_MODINC/s:-p:-I:g' \
-		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
-
-	sed \
-		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
-		-e "s:-o charmxi:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
-		-e "s:-o charmrun:${LDFLAGS} &:g" \
-		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
-		-e "s:-o charmd:${LDFLAGS} &:g" \
-		-i \
-		src/scripts/Makefile \
-		src/arch/net/charmrun/Makefile || die
-
-	# CMK optimization
-	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
-
-	# Fix QA notice. Filed report with upstream.
-	append-cflags -DALLOCA_H
-
-	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
-	epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
-}
-
-src_compile() {
-	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} ${CFLAGS}"
-
-	# Build charmm++ first.
-	einfo "running ./build charm++ ${mybuildoptions}"
-	./build charm++ ${mybuildoptions} || die "Failed to build charm++"
-
-	# make pdf/html docs
-	if use doc; then
-		python-single-r1_pkg_setup
-		python_fix_shebang "${S}/doc"
-		einfo "forcing ${EPYTHON}"
-		emake -j1 -C doc/charm++
-	fi
-}
-
-src_test() {
-	make -C tests/charm++ test TESTOPTS="++local" || die
-}
-
-src_install() {
-	# Make charmc play well with gentoo before we move it into /usr/bin. This
-	# patch cannot be applied during src_prepare() because the charmc wrapper
-	# is used during building.
-	epatch "${FILESDIR}/charm-6.5.1-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"
-
-	# In the following, some of the files are symlinks to ../tmp which we need
-	# to dereference first (see bug 432834).
-
-	local i
-
-	# Install binaries.
-	for i in bin/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dobin "${i}"
-	done
-
-	# Install headers.
-	insinto /usr/include/${P}
-	for i in include/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		doins "${i}"
-	done
-
-	# Install static libs. Charm has a lot of .o "libs" that it requires at
-	# runtime.
-	if use static-libs; then
-		for i in lib/*.{a,o}; do
-			if [[ -L ${i} ]]; then
-				i=$(readlink -e "${i}") || die
-			fi
-			dolib "${i}"
-		done
-	fi
-
-	# Install shared libs.
-	for i in lib_so/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dolib.so "${i}"
-	done
-
-	# Basic docs.
-	dodoc CHANGES README
-
-	# Install examples.
-	if use examples; then
-		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++/*
-	fi
-
-	# Install pdf/html docs
-	if use doc; then
-		cd "${S}/doc/charm++"
-		# Install pdfs.
-		insinto /usr/share/doc/${PF}/pdf
-		doins  *.pdf
-		# Install html.
-		docinto html
-		dohtml -r manual/*
-	fi
-}
-
-pkg_postinst() {
-	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'."
-}

diff --git a/sys-cluster/charm/charm-6.5.1.ebuild b/sys-cluster/charm/charm-6.5.1.ebuild
deleted file mode 100644
index 5405952..0000000
--- a/sys-cluster/charm/charm-6.5.1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="Message-passing parallel language and runtime system"
-HOMEPAGE="http://charm.cs.uiuc.edu/"
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
-
-LICENSE="charm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		>=app-text/poppler-0.12.3-r3[utils]
-		dev-tex/latex2html
-		virtual/tex-base
-	)"
-
-REQUIRED_USE="
-	cmkopt? ( !charmdebug !charmtracing )
-	charmproduction? ( !charmdebug !charmtracing )"
-
-FORTRAN_STANDARD="90"
-
-get_opts() {
-	local CHARM_OPTS
-
-	# TCP instead of default UDP for socket comunication
-	# protocol
-	CHARM_OPTS+="$(usex tcp ' tcp' '')"
-
-	# enable direct SMP support using shared memory
-	CHARM_OPTS+="$(usex smp ' smp' '')"
-
-	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
-	CHARM_OPTS+="$(usex syncft ' syncft' '')"
-
-	# Build shared libraries by default.
-	CHARM_OPTS+=" --build-shared"
-
-	if use charmproduction; then
-		CHARM_OPTS+=" --with-production"
-	else
-		if use charmdebug; then
-			CHARM_OPTS+=" --enable-charmdebug"
-		fi
-
-		if use charmtracing; then
-			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
-		fi
-	fi
-
-	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
-	echo $CHARM_OPTS
-}
-
-src_prepare() {
-	sed \
-		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
-		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
-		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
-		-e '/CMK_F90_MODINC/s:-p:-I:g' \
-		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
-
-	sed \
-		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
-		-e "s:-o charmxi:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
-		-e "s:-o charmrun:${LDFLAGS} &:g" \
-		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
-		-e "s:-o charmd:${LDFLAGS} &:g" \
-		-i \
-		src/scripts/Makefile \
-		src/arch/net/charmrun/Makefile || die
-
-	# CMK optimization
-	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
-
-	# Fix QA notice. Filed report with upstream.
-	append-cflags -DALLOCA_H
-
-	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
-}
-
-src_compile() {
-	# Build charmm++ first.
-	einfo "running ./build charm++ $(usex mpi 'mpi' 'net')-linux$(usex amd64 '-amd64' '') $(get_opts) ${MAKEOPTS} ${CFLAGS}"
-	./build charm++ $(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') \
-		$(get_opts) ${MAKEOPTS} ${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_test() {
-	make -C tests/charm++ test TESTOPTS="++local" || die
-}
-
-src_install() {
-	# Make charmc play well with gentoo before we move it into /usr/bin.
-	epatch "${FILESDIR}/charm-6.5.0-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"
-
-	# In the following, some of the files are symlinks to ../tmp which we need
-	# to dereference first (see bug 432834).
-
-	local i
-
-	# Install binaries.
-	for i in bin/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dobin "${i}"
-	done
-
-	# Install headers.
-	insinto /usr/include/${P}
-	for i in include/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		doins "${i}"
-	done
-
-	# Install static libs. Charm has a lot of .o "libs" that it requires at
-	# runtime.
-	if use static-libs; then
-		for i in lib/*.{a,o}; do
-			if [[ -L ${i} ]]; then
-				i=$(readlink -e "${i}") || die
-			fi
-			dolib "${i}"
-		done
-	fi
-
-	# Install shared libs.
-	for i in lib_so/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dolib.so "${i}"
-	done
-
-	# Basic docs.
-	dodoc CHANGES README
-
-	# Install examples.
-	if use examples; then
-		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++/*
-	fi
-
-	# Install pdf/html docs
-	if use doc; then
-		cd "${S}"/doc
-		# Install pdfs.
-		insinto /usr/share/doc/${PF}/pdf
-		doins  doc/pdf/*
-		# Install html.
-		docinto html
-		dohtml -r doc/html/*
-	fi
-}
-
-pkg_postinst() {
-	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'."
-}


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-11-20  4:47 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-11-20  4:47 UTC (permalink / raw
  To: gentoo-commits

commit:     da4c730673f4b082649de12c6a1ad75d4bea0fb2
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Wed Nov 20 04:47:09 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Wed Nov 20 04:47:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=da4c7306

sys-cluster/charm-6.6.0_rc1: Version bump.

Package-Manager: portage-2.2.7

---
 sys-cluster/charm/ChangeLog              |   5 +
 sys-cluster/charm/charm-6.6.0_rc1.ebuild | 219 +++++++++++++++++++++++++++++++
 2 files changed, 224 insertions(+)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index cab86a4..5f9842d 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*charm-6.6.0_rc1 (20 Nov 2013)
+
+  20 Nov 2013; Nicolas Bock <nicolasbock@gmail.com> +charm-6.6.0_rc1.ebuild:
+  sys-cluster/charm-6.6.0_rc1: Version bump.
+
 *charm-6.5.1-r3 (08 Nov 2013)
 
   08 Nov 2013; Nicolas Bock <nicolasbock@gmail.com> +charm-6.5.1-r3.ebuild,

diff --git a/sys-cluster/charm/charm-6.6.0_rc1.ebuild b/sys-cluster/charm/charm-6.6.0_rc1.ebuild
new file mode 100644
index 0000000..0791c1c
--- /dev/null
+++ b/sys-cluster/charm/charm-6.6.0_rc1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $
+
+EAPI=5
+
+FORTRAN_STANDARD="90"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils flag-o-matic fortran-2 git-r3 multilib python-any-r1 toolchain-funcs
+
+DESCRIPTION="Message-passing parallel language and runtime system"
+HOMEPAGE="http://charm.cs.uiuc.edu/"
+SRC_URI=""
+
+EGIT_REPO_URI="http://charm.cs.uiuc.edu/gerrit/charm"
+EGIT_BRANCH="charm"
+EGIT_COMMIT="57051a8f07496b9f8f696f59fad477c8a2bc3e4d"
+
+LICENSE="charm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
+
+RDEPEND="mpi? ( virtual/mpi )"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		>=app-text/poppler-0.12.3-r3[utils]
+		dev-tex/latex2html
+		virtual/tex-base
+		>=dev-python/beautifulsoup-4
+		dev-python/lxml
+		media-libs/netpbm
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	doc? ( ${PYTHON_REQ_USE} )
+	cmkopt? ( !charmdebug !charmtracing )
+	charmproduction? ( !charmdebug !charmtracing )"
+
+get_opts() {
+	local CHARM_OPTS
+
+	# TCP instead of default UDP for socket comunication
+	# protocol
+	CHARM_OPTS+="$(usex tcp ' tcp' '')"
+
+	# enable direct SMP support using shared memory
+	CHARM_OPTS+="$(usex smp ' smp' '')"
+
+	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
+	CHARM_OPTS+="$(usex syncft ' syncft' '')"
+
+	# Build shared libraries by default.
+	CHARM_OPTS+=" --build-shared"
+
+	if use charmproduction; then
+		CHARM_OPTS+=" --with-production"
+	else
+		if use charmdebug; then
+			CHARM_OPTS+=" --enable-charmdebug"
+		fi
+
+		if use charmtracing; then
+			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
+		fi
+	fi
+
+	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
+
+	echo $CHARM_OPTS
+}
+
+src_prepare() {
+	sed \
+		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \
+		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/CMK_CF90/s:\`which f90.*$::g" \
+		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
+		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
+		-e '/CMK_F90_MODINC/s:-p:-I:g' \
+		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
+		-i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die
+	sed \
+		-e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-i src/arch/common/*.sh || die
+
+	sed \
+		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
+		-e "s:-o charmxi:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
+		-e "s:-o charmrun:${LDFLAGS} &:g" \
+		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
+		-e "s:-o charmd:${LDFLAGS} &:g" \
+		-i \
+		src/scripts/Makefile \
+		src/util/charmrun-src/Makefile || die
+
+	# CMK optimization
+	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
+
+	# Fix QA notice. Filed report with upstream.
+	append-cflags -DALLOCA_H
+
+	#epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
+	#epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
+	#epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
+	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
+	epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch"
+	#epatch "${FILESDIR}/charm-6.5.1-static-library-fix.patch"
+}
+
+src_compile() {
+	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}"
+
+	# Build charmm++ first.
+	einfo "running ./build charm++ ${mybuildoptions}"
+	./build charm++ ${mybuildoptions} || die "Failed to build charm++"
+
+	# make pdf/html docs
+	if use doc; then
+		emake -j1 -C doc/charm++
+	fi
+}
+
+src_test() {
+	make -C tests/charm++ test TESTOPTS="++local" || die
+}
+
+src_install() {
+	# Make charmc play well with gentoo before we move it into /usr/bin. This
+	# patch cannot be applied during src_prepare() because the charmc wrapper
+	# is used during building.
+	epatch "${FILESDIR}/charm-6.5.1-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"
+
+	# In the following, some of the files are symlinks to ../tmp which we need
+	# to dereference first (see bug 432834).
+
+	local i
+
+	# Install binaries.
+	for i in bin/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dobin "${i}"
+	done
+
+	# Install headers.
+	insinto /usr/include/${P}
+	for i in include/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		doins "${i}"
+	done
+
+	# Install static libs. Charm has a lot of .o "libs" that it requires at
+	# runtime.
+	if use static-libs; then
+		for i in lib/*.{a,o}; do
+			if [[ -L ${i} ]]; then
+				i=$(readlink -e "${i}") || die
+			fi
+			dolib "${i}"
+		done
+	fi
+
+	# Install shared libs.
+	for i in lib_so/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dolib.so "${i}"
+	done
+
+	# Basic docs.
+	dodoc CHANGES README
+
+	# Install examples.
+	if use examples; then
+		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++/*
+	fi
+
+	# Install pdf/html docs
+	if use doc; then
+		cd "${S}/doc/charm++"
+		# Install pdfs.
+		insinto /usr/share/doc/${PF}/pdf
+		doins  *.pdf
+		# Install html.
+		docinto html
+		dohtml -r manual/*
+	fi
+}
+
+pkg_postinst() {
+	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'."
+}


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-11-22 16:42 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-11-22 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0c3a99a4920eac32eeb2f9c920f886c48d24f302
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Fri Nov 22 16:41:52 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri Nov 22 16:41:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0c3a99a4

sys-cluster/charm-6.6.0-rc1: Reorganized some variables.

Package-Manager: portage-2.2.7

---
 sys-cluster/charm/ChangeLog              | 3 +++
 sys-cluster/charm/charm-6.6.0_rc1.ebuild | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 9b32737..833fa07 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Nov 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.6.0_rc1.ebuild:
+  sys-cluster/charm-6.6.0-rc1: Reorganized some variables.
+
   20 Nov 2013; Nicolas Bock <nicolasbock@gmail.com>
   +files/charm-6.6.0-static-library-fix.patch, charm-6.6.0_rc1.ebuild:
   sys-cluster/charm-6.6.0_rc1: Rewrote patch to enable shared mode.  The patch

diff --git a/sys-cluster/charm/charm-6.6.0_rc1.ebuild b/sys-cluster/charm/charm-6.6.0_rc1.ebuild
index 0870df5..7823e50 100644
--- a/sys-cluster/charm/charm-6.6.0_rc1.ebuild
+++ b/sys-cluster/charm/charm-6.6.0_rc1.ebuild
@@ -117,11 +117,14 @@ src_prepare() {
 }
 
 src_compile() {
-	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}"
+	local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')"
+	local build_options="$(get_opts)"
+	local build_charmc_options="${MAKEOPTS} -j1"
+	local build_commandline="${build_version} ${build_options} ${build_charmc_options}"
 
 	# Build charmm++ first.
-	einfo "running ./build charm++ ${mybuildoptions}"
-	./build charm++ ${mybuildoptions} || die "Failed to build charm++"
+	einfo "running ./build charm++ ${build_commandline}"
+	./build charm++ ${build_commandline} || die "Failed to build charm++"
 
 	# make pdf/html docs
 	if use doc; then


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2013-12-13 19:12 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2013-12-13 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     ebd2304a935d0a76bdb361b9e7382079a228ebe0
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Fri Dec 13 19:09:38 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri Dec 13 19:09:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ebd2304a

sys-cluster/charm: Updated maintainer email to gentoo.org.

Package-Manager: portage-2.2.7

---
 sys-cluster/charm/ChangeLog    | 3 +++
 sys-cluster/charm/metadata.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 833fa07..e4057d2 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Dec 2013; Nicolas Bock <nicolasbock@gentoo.org> metadata.xml:
+  sys-cluster/charm: Updated maintainer email to gentoo.org.
+
   22 Nov 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.6.0_rc1.ebuild:
   sys-cluster/charm-6.6.0-rc1: Reorganized some variables.
 

diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
index 8ec82bb..762f22d 100644
--- a/sys-cluster/charm/metadata.xml
+++ b/sys-cluster/charm/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>sci</herd>
 	<maintainer>
-		<email>nicolasbock@gmail.com</email>
+		<email>nicolasbock@gentoo.org</email>
 	</maintainer>
 	<use>
 		<flag name="charmdebug">Enable the charm debugger</flag>


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2014-01-02 16:15 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2014-01-02 16:15 UTC (permalink / raw
  To: gentoo-commits

commit:     e1fb5129431ecc369598449a879ee326d6df4a8d
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Thu Jan  2 16:15:23 2014 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu Jan  2 16:15:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e1fb5129

sys-cluster/charm: Removing versions moved to x86.

Package-Manager: portage-2.2.7

---
 sys-cluster/charm/ChangeLog             |   6 +-
 sys-cluster/charm/charm-6.5.1-r2.ebuild | 209 --------------------------------
 sys-cluster/charm/charm-6.5.1-r3.ebuild | 204 -------------------------------
 3 files changed, 5 insertions(+), 414 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index e4057d2..01e8eff 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sys-cluster/charm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> -Manifest,
+  -charm-6.5.1-r2.ebuild, -charm-6.5.1-r3.ebuild:
+  sys-cluster/charm: Removing versions moved to x86.
+
   13 Dec 2013; Nicolas Bock <nicolasbock@gentoo.org> metadata.xml:
   sys-cluster/charm: Updated maintainer email to gentoo.org.
 

diff --git a/sys-cluster/charm/charm-6.5.1-r2.ebuild b/sys-cluster/charm/charm-6.5.1-r2.ebuild
deleted file mode 100644
index 4d1523e..0000000
--- a/sys-cluster/charm/charm-6.5.1-r2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-single-r1
-
-DESCRIPTION="Message-passing parallel language and runtime system"
-HOMEPAGE="http://charm.cs.uiuc.edu/"
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
-
-LICENSE="charm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		>=app-text/poppler-0.12.3-r3[utils]
-		dev-tex/latex2html
-		virtual/tex-base
-		>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-libs/netpbm
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	doc? ( ${PYTHON_REQUIRED_USE} )
-	cmkopt? ( !charmdebug !charmtracing )
-	charmproduction? ( !charmdebug !charmtracing )"
-
-FORTRAN_STANDARD="90"
-
-get_opts() {
-	local CHARM_OPTS
-
-	# TCP instead of default UDP for socket comunication
-	# protocol
-	CHARM_OPTS+="$(usex tcp ' tcp' '')"
-
-	# enable direct SMP support using shared memory
-	CHARM_OPTS+="$(usex smp ' smp' '')"
-
-	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
-	CHARM_OPTS+="$(usex syncft ' syncft' '')"
-
-	# Build shared libraries by default.
-	CHARM_OPTS+=" --build-shared"
-
-	if use charmproduction; then
-		CHARM_OPTS+=" --with-production"
-	else
-		if use charmdebug; then
-			CHARM_OPTS+=" --enable-charmdebug"
-		fi
-
-		if use charmtracing; then
-			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
-		fi
-	fi
-
-	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
-	echo $CHARM_OPTS
-}
-
-src_prepare() {
-	sed \
-		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
-		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
-		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
-		-e '/CMK_F90_MODINC/s:-p:-I:g' \
-		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
-
-	sed \
-		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
-		-e "s:-o charmxi:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
-		-e "s:-o charmrun:${LDFLAGS} &:g" \
-		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
-		-e "s:-o charmd:${LDFLAGS} &:g" \
-		-i \
-		src/scripts/Makefile \
-		src/arch/net/charmrun/Makefile || die
-
-	# CMK optimization
-	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
-
-	# Fix QA notice. Filed report with upstream.
-	append-cflags -DALLOCA_H
-
-	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
-	epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
-	epatch "${FILESDIR}/charm-6.5.1-static-library-fix.patch"
-}
-
-src_compile() {
-	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}"
-
-	# Build charmm++ first.
-	einfo "running ./build charm++ ${mybuildoptions}"
-	./build charm++ ${mybuildoptions} || die "Failed to build charm++"
-
-	# make pdf/html docs
-	if use doc; then
-		python-single-r1_pkg_setup
-		python_fix_shebang "${S}/doc"
-		einfo "forcing ${EPYTHON}"
-		emake -j1 -C doc/charm++
-	fi
-}
-
-src_test() {
-	make -C tests/charm++ test TESTOPTS="++local" || die
-}
-
-src_install() {
-	# Make charmc play well with gentoo before we move it into /usr/bin. This
-	# patch cannot be applied during src_prepare() because the charmc wrapper
-	# is used during building.
-	epatch "${FILESDIR}/charm-6.5.1-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"
-
-	# In the following, some of the files are symlinks to ../tmp which we need
-	# to dereference first (see bug 432834).
-
-	local i
-
-	# Install binaries.
-	for i in bin/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dobin "${i}"
-	done
-
-	# Install headers.
-	insinto /usr/include/${P}
-	for i in include/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		doins "${i}"
-	done
-
-	# Install static libs. Charm has a lot of .o "libs" that it requires at
-	# runtime.
-	if use static-libs; then
-		for i in lib/*.{a,o}; do
-			if [[ -L ${i} ]]; then
-				i=$(readlink -e "${i}") || die
-			fi
-			dolib "${i}"
-		done
-	fi
-
-	# Install shared libs.
-	for i in lib_so/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dolib.so "${i}"
-	done
-
-	# Basic docs.
-	dodoc CHANGES README
-
-	# Install examples.
-	if use examples; then
-		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++/*
-	fi
-
-	# Install pdf/html docs
-	if use doc; then
-		cd "${S}/doc/charm++"
-		# Install pdfs.
-		insinto /usr/share/doc/${PF}/pdf
-		doins  *.pdf
-		# Install html.
-		docinto html
-		dohtml -r manual/*
-	fi
-}
-
-pkg_postinst() {
-	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'."
-}

diff --git a/sys-cluster/charm/charm-6.5.1-r3.ebuild b/sys-cluster/charm/charm-6.5.1-r3.ebuild
deleted file mode 100644
index 3f11990..0000000
--- a/sys-cluster/charm/charm-6.5.1-r3.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="Message-passing parallel language and runtime system"
-HOMEPAGE="http://charm.cs.uiuc.edu/"
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
-
-LICENSE="charm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		>=app-text/poppler-0.12.3-r3[utils]
-		dev-tex/latex2html
-		virtual/tex-base
-		>=dev-python/beautifulsoup-4
-		dev-python/lxml
-		media-libs/netpbm
-	)"
-
-REQUIRED_USE="
-	doc? ( ${PYTHON_REQUIRED_USE} )
-	cmkopt? ( !charmdebug !charmtracing )
-	charmproduction? ( !charmdebug !charmtracing )"
-
-FORTRAN_STANDARD="90"
-
-get_opts() {
-	local CHARM_OPTS
-
-	# TCP instead of default UDP for socket comunication
-	# protocol
-	CHARM_OPTS+="$(usex tcp ' tcp' '')"
-
-	# enable direct SMP support using shared memory
-	CHARM_OPTS+="$(usex smp ' smp' '')"
-
-	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
-	CHARM_OPTS+="$(usex syncft ' syncft' '')"
-
-	# Build shared libraries by default.
-	CHARM_OPTS+=" --build-shared"
-
-	if use charmproduction; then
-		CHARM_OPTS+=" --with-production"
-	else
-		if use charmdebug; then
-			CHARM_OPTS+=" --enable-charmdebug"
-		fi
-
-		if use charmtracing; then
-			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
-		fi
-	fi
-
-	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
-	echo $CHARM_OPTS
-}
-
-src_prepare() {
-	sed \
-		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
-		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
-		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
-		-e '/CMK_F90_MODINC/s:-p:-I:g' \
-		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
-
-	sed \
-		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
-		-e "s:-o charmxi:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
-		-e "s:-o charmrun:${LDFLAGS} &:g" \
-		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
-		-e "s:-o charmd:${LDFLAGS} &:g" \
-		-i \
-		src/scripts/Makefile \
-		src/arch/net/charmrun/Makefile || die
-
-	# CMK optimization
-	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
-
-	# Fix QA notice. Filed report with upstream.
-	append-cflags -DALLOCA_H
-
-	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
-	epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch"
-	epatch "${FILESDIR}/charm-6.5.1-static-library-fix.patch"
-}
-
-src_compile() {
-	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}"
-
-	# Build charmm++ first.
-	einfo "running ./build charm++ ${mybuildoptions}"
-	./build charm++ ${mybuildoptions} || die "Failed to build charm++"
-
-	# make pdf/html docs
-	if use doc; then
-		emake -j1 -C doc/charm++
-	fi
-}
-
-src_test() {
-	make -C tests/charm++ test TESTOPTS="++local" || die
-}
-
-src_install() {
-	# Make charmc play well with gentoo before we move it into /usr/bin. This
-	# patch cannot be applied during src_prepare() because the charmc wrapper
-	# is used during building.
-	epatch "${FILESDIR}/charm-6.5.1-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"
-
-	# In the following, some of the files are symlinks to ../tmp which we need
-	# to dereference first (see bug 432834).
-
-	local i
-
-	# Install binaries.
-	for i in bin/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dobin "${i}"
-	done
-
-	# Install headers.
-	insinto /usr/include/${P}
-	for i in include/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		doins "${i}"
-	done
-
-	# Install static libs. Charm has a lot of .o "libs" that it requires at
-	# runtime.
-	if use static-libs; then
-		for i in lib/*.{a,o}; do
-			if [[ -L ${i} ]]; then
-				i=$(readlink -e "${i}") || die
-			fi
-			dolib "${i}"
-		done
-	fi
-
-	# Install shared libs.
-	for i in lib_so/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dolib.so "${i}"
-	done
-
-	# Basic docs.
-	dodoc CHANGES README
-
-	# Install examples.
-	if use examples; then
-		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++/*
-	fi
-
-	# Install pdf/html docs
-	if use doc; then
-		cd "${S}/doc/charm++"
-		# Install pdfs.
-		insinto /usr/share/doc/${PF}/pdf
-		doins  *.pdf
-		# Install html.
-		docinto html
-		dohtml -r manual/*
-	fi
-}
-
-pkg_postinst() {
-	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'."
-}


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2014-01-02 16:55 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2014-01-02 16:55 UTC (permalink / raw
  To: gentoo-commits

commit:     c2c975d49b88a5d6308351e8aa5c610626e3e402
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Thu Jan  2 16:54:25 2014 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Thu Jan  2 16:54:25 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c2c975d4

sys-cluster/charm-6.6.0_rc1-r1: Cleanup of python deps.

Package-Manager: portage-2.2.7

---
 sys-cluster/charm/ChangeLog                 |   5 +
 sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild | 224 ++++++++++++++++++++++++++++
 2 files changed, 229 insertions(+)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 01e8eff..d5ed8f3 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*charm-6.6.0_rc1-r1 (02 Jan 2014)
+
+  02 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> +charm-6.6.0_rc1-r1.ebuild:
+  sys-cluster/charm-6.6.0_rc1-r1: Cleanup of python deps.
+
   02 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> -Manifest,
   -charm-6.5.1-r2.ebuild, -charm-6.5.1-r3.ebuild:
   sys-cluster/charm: Removing versions moved to x86.

diff --git a/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild b/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild
new file mode 100644
index 0000000..8bc3996
--- /dev/null
+++ b/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $
+
+EAPI=5
+
+FORTRAN_STANDARD="90"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit eutils flag-o-matic fortran-2 git-r3 multilib python-any-r1 toolchain-funcs
+
+DESCRIPTION="Message-passing parallel language and runtime system"
+HOMEPAGE="http://charm.cs.uiuc.edu/"
+SRC_URI=""
+
+EGIT_REPO_URI="http://charm.cs.uiuc.edu/gerrit/charm"
+EGIT_BRANCH="charm"
+EGIT_COMMIT="57051a8f07496b9f8f696f59fad477c8a2bc3e4d"
+
+LICENSE="charm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
+
+RDEPEND="mpi? ( virtual/mpi )"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		>=app-text/poppler-0.12.3-r3[utils]
+		dev-tex/latex2html
+		virtual/tex-base
+		$(python_gen_any_dep '
+			>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
+			dev-python/lxml[${PYTHON_USEDEP}]
+		')
+		media-libs/netpbm
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	doc? ( ${PYTHON_REQUIRED_USE} )
+	cmkopt? ( !charmdebug !charmtracing )
+	charmproduction? ( !charmdebug !charmtracing )"
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+get_opts() {
+	local CHARM_OPTS
+
+	# TCP instead of default UDP for socket comunication
+	# protocol
+	CHARM_OPTS+="$(usex tcp ' tcp' '')"
+
+	# enable direct SMP support using shared memory
+	CHARM_OPTS+="$(usex smp ' smp' '')"
+
+	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
+	CHARM_OPTS+="$(usex syncft ' syncft' '')"
+
+	# Build shared libraries by default.
+	CHARM_OPTS+=" --build-shared"
+
+	if use charmproduction; then
+		CHARM_OPTS+=" --with-production"
+	else
+		if use charmdebug; then
+			CHARM_OPTS+=" --enable-charmdebug"
+		fi
+
+		if use charmtracing; then
+			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
+		fi
+	fi
+
+	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
+	echo $CHARM_OPTS
+}
+
+src_prepare() {
+	sed \
+		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \
+		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/CMK_CF90/s:\`which f90.*$::g" \
+		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
+		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
+		-e '/CMK_F90_MODINC/s:-p:-I:g' \
+		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
+		-i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die
+	sed \
+		-e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-i src/arch/common/*.sh || die
+
+	sed \
+		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
+		-e "s:-o charmxi:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
+		-e "s:-o charmrun:${LDFLAGS} &:g" \
+		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
+		-e "s:-o charmd:${LDFLAGS} &:g" \
+		-i \
+		src/scripts/Makefile \
+		src/util/charmrun-src/Makefile || die
+
+	# CMK optimization
+	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
+
+	# Fix QA notice. Filed report with upstream.
+	append-cflags -DALLOCA_H
+
+	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
+	epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch"
+	epatch "${FILESDIR}/charm-6.6.0-static-library-fix.patch"
+}
+
+src_compile() {
+	local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')"
+	local build_options="$(get_opts)"
+	local build_charmc_options="${MAKEOPTS} -j1"
+	local build_commandline="${build_version} ${build_options} ${build_charmc_options}"
+
+	# Build charmm++ first.
+	einfo "running ./build charm++ ${build_commandline}"
+	./build charm++ ${build_commandline} || die "Failed to build charm++"
+
+	# make pdf/html docs
+	if use doc; then
+		emake -j1 -C doc/charm++
+	fi
+}
+
+src_test() {
+	make -C tests/charm++ test TESTOPTS="++local" || die
+}
+
+src_install() {
+	# Make charmc play well with gentoo before we move it into /usr/bin. This
+	# patch cannot be applied during src_prepare() because the charmc wrapper
+	# is used during building.
+	epatch "${FILESDIR}/charm-6.5.1-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"
+
+	# In the following, some of the files are symlinks to ../tmp which we need
+	# to dereference first (see bug 432834).
+
+	local i
+
+	# Install binaries.
+	for i in bin/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dobin "${i}"
+	done
+
+	# Install headers.
+	insinto /usr/include/${P}
+	for i in include/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		doins "${i}"
+	done
+
+	# Install static libs. Charm has a lot of .o "libs" that it requires at
+	# runtime.
+	if use static-libs; then
+		for i in lib/*.{a,o}; do
+			if [[ -L ${i} ]]; then
+				i=$(readlink -e "${i}") || die
+			fi
+			dolib "${i}"
+		done
+	fi
+
+	# Install shared libs.
+	for i in lib_so/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dolib.so "${i}"
+	done
+
+	# Basic docs.
+	dodoc CHANGES README
+
+	# Install examples.
+	if use examples; then
+		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++/*
+	fi
+
+	# Install pdf/html docs
+	if use doc; then
+		cd "${S}/doc/charm++"
+		# Install pdfs.
+		insinto /usr/share/doc/${PF}/pdf
+		doins  *.pdf
+		# Install html.
+		docinto html
+		dohtml -r manual/*
+	fi
+}
+
+pkg_postinst() {
+	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'."
+}


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2014-01-03 15:29 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2014-01-03 15:29 UTC (permalink / raw
  To: gentoo-commits

commit:     ce491c2629563e93faee9b2b0b7a617e09b724f9
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Fri Jan  3 15:28:45 2014 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri Jan  3 15:28:45 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ce491c26

sys-cluster/charm-6.6.0_rc1-r1: Add non-shallow option to git to avoid breakage of checked out repository.

Package-Manager: portage-2.2.7

---
 sys-cluster/charm/ChangeLog                 | 4 ++++
 sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild | 1 +
 2 files changed, 5 insertions(+)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index d5ed8f3..64bcf4c 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> charm-6.6.0_rc1-r1.ebuild:
+  sys-cluster/charm-6.6.0_rc1-r1: Add non-shallow option to git to avoid
+  breakage of checked out repository.
+
 *charm-6.6.0_rc1-r1 (02 Jan 2014)
 
   02 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> +charm-6.6.0_rc1-r1.ebuild:

diff --git a/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild b/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild
index 8bc3996..3fe27ee 100644
--- a/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild
+++ b/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild
@@ -16,6 +16,7 @@ SRC_URI=""
 EGIT_REPO_URI="http://charm.cs.uiuc.edu/gerrit/charm"
 EGIT_BRANCH="charm"
 EGIT_COMMIT="57051a8f07496b9f8f696f59fad477c8a2bc3e4d"
+EGIT_NONSHALLOW="yes"
 
 LICENSE="charm"
 SLOT="0"


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2014-01-06 21:46 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2014-01-06 21:46 UTC (permalink / raw
  To: gentoo-commits

commit:     cd895c35fe4dc4046fbe5f43c4b1af778c6298ae
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Mon Jan  6 21:46:40 2014 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Mon Jan  6 21:46:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cd895c35

sys-cluster/charm-6.6.0_rc1-r1: After ongoing problems with charm's git
repository, I packaged the rc as a tar file and serve it from my personal dev
webpage.

Package-Manager: portage-2.2.7

---
 sys-cluster/charm/ChangeLog                 | 5 +++++
 sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild | 9 ++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 64bcf4c..2ad39a9 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> charm-6.6.0_rc1-r1.ebuild:
+  sys-cluster/charm-6.6.0_rc1-r1: After ongoing problems with charm's git
+  repository, I packaged the rc as a tar file and serve it from my personal dev
+  webpage.
+
   03 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> charm-6.6.0_rc1-r1.ebuild:
   sys-cluster/charm-6.6.0_rc1-r1: Add non-shallow option to git to avoid
   breakage of checked out repository.

diff --git a/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild b/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild
index 3fe27ee..bb27d7e 100644
--- a/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild
+++ b/sys-cluster/charm/charm-6.6.0_rc1-r1.ebuild
@@ -7,16 +7,11 @@ EAPI=5
 FORTRAN_STANDARD="90"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
-inherit eutils flag-o-matic fortran-2 git-r3 multilib python-any-r1 toolchain-funcs
+inherit eutils flag-o-matic fortran-2 multilib python-any-r1 toolchain-funcs
 
 DESCRIPTION="Message-passing parallel language and runtime system"
 HOMEPAGE="http://charm.cs.uiuc.edu/"
-SRC_URI=""
-
-EGIT_REPO_URI="http://charm.cs.uiuc.edu/gerrit/charm"
-EGIT_BRANCH="charm"
-EGIT_COMMIT="57051a8f07496b9f8f696f59fad477c8a2bc3e4d"
-EGIT_NONSHALLOW="yes"
+SRC_URI="http://dev.gentoo.org/~nicolasbock/charm-${PV}.tar.bz2"
 
 LICENSE="charm"
 SLOT="0"


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2014-02-19 21:54 Nicolas Bock
  0 siblings, 0 replies; 30+ messages in thread
From: Nicolas Bock @ 2014-02-19 21:54 UTC (permalink / raw
  To: gentoo-commits

commit:     c313573644cfe34f55ace1c4f9f11a6b85d4978f
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Wed Feb 19 21:53:58 2014 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Wed Feb 19 21:53:58 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c3135736

sys-cluster/charm-6.6.0_rc2: Version bump to new release candidate.

Package-Manager: portage-2.2.7

---
 sys-cluster/charm/ChangeLog              |   5 +
 sys-cluster/charm/charm-6.6.0_rc2.ebuild | 220 +++++++++++++++++++++++++++++++
 2 files changed, 225 insertions(+)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 2ad39a9..7920664 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*charm-6.6.0_rc2 (19 Feb 2014)
+
+  19 Feb 2014; Nicolas Bock <nicolasbock@gentoo.org> +charm-6.6.0_rc2.ebuild:
+  sys-cluster/charm-6.6.0_rc2: Version bump to new release candidate.
+
   06 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> charm-6.6.0_rc1-r1.ebuild:
   sys-cluster/charm-6.6.0_rc1-r1: After ongoing problems with charm's git
   repository, I packaged the rc as a tar file and serve it from my personal dev

diff --git a/sys-cluster/charm/charm-6.6.0_rc2.ebuild b/sys-cluster/charm/charm-6.6.0_rc2.ebuild
new file mode 100644
index 0000000..5be505e
--- /dev/null
+++ b/sys-cluster/charm/charm-6.6.0_rc2.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+FORTRAN_STANDARD="90"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit eutils flag-o-matic fortran-2 multilib python-any-r1 toolchain-funcs
+
+DESCRIPTION="Message-passing parallel language and runtime system"
+HOMEPAGE="http://charm.cs.uiuc.edu/"
+SRC_URI="http://dev.gentoo.org/~nicolasbock/charm-${PV}.tar.bz2"
+
+LICENSE="charm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
+
+RDEPEND="mpi? ( virtual/mpi )"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		>=app-text/poppler-0.12.3-r3[utils]
+		dev-tex/latex2html
+		virtual/tex-base
+		$(python_gen_any_dep '
+			>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
+			dev-python/lxml[${PYTHON_USEDEP}]
+		')
+		media-libs/netpbm
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	doc? ( ${PYTHON_REQUIRED_USE} )
+	cmkopt? ( !charmdebug !charmtracing )
+	charmproduction? ( !charmdebug !charmtracing )"
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+get_opts() {
+	local CHARM_OPTS
+
+	# TCP instead of default UDP for socket comunication
+	# protocol
+	CHARM_OPTS+="$(usex tcp ' tcp' '')"
+
+	# enable direct SMP support using shared memory
+	CHARM_OPTS+="$(usex smp ' smp' '')"
+
+	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
+	CHARM_OPTS+="$(usex syncft ' syncft' '')"
+
+	# Build shared libraries by default.
+	CHARM_OPTS+=" --build-shared"
+
+	if use charmproduction; then
+		CHARM_OPTS+=" --with-production"
+	else
+		if use charmdebug; then
+			CHARM_OPTS+=" --enable-charmdebug"
+		fi
+
+		if use charmtracing; then
+			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
+		fi
+	fi
+
+	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
+	echo $CHARM_OPTS
+}
+
+src_prepare() {
+	sed \
+		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \
+		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/CMK_CF90/s:\`which f90.*$::g" \
+		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
+		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
+		-e '/CMK_F90_MODINC/s:-p:-I:g' \
+		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
+		-i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die
+	sed \
+		-e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-i src/arch/common/*.sh || die
+
+	sed \
+		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
+		-e "s:-o charmxi:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
+		-e "s:-o charmrun:${LDFLAGS} &:g" \
+		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
+		-e "s:-o charmd:${LDFLAGS} &:g" \
+		-i \
+		src/scripts/Makefile \
+		src/util/charmrun-src/Makefile || die
+
+	# CMK optimization
+	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
+
+	# Fix QA notice. Filed report with upstream.
+	append-cflags -DALLOCA_H
+
+	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
+	epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch"
+	epatch "${FILESDIR}/charm-6.6.0-static-library-fix.patch"
+}
+
+src_compile() {
+	local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')"
+	local build_options="$(get_opts)"
+	local build_charmc_options="${MAKEOPTS} -j1"
+	local build_commandline="${build_version} ${build_options} ${build_charmc_options}"
+
+	# Build charmm++ first.
+	einfo "running ./build charm++ ${build_commandline}"
+	./build charm++ ${build_commandline} || die "Failed to build charm++"
+
+	# make pdf/html docs
+	if use doc; then
+		emake -j1 -C doc/charm++
+	fi
+}
+
+src_test() {
+	make -C tests/charm++ test TESTOPTS="++local" || die
+}
+
+src_install() {
+	# Make charmc play well with gentoo before we move it into /usr/bin. This
+	# patch cannot be applied during src_prepare() because the charmc wrapper
+	# is used during building.
+	epatch "${FILESDIR}/charm-6.5.1-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"
+
+	# In the following, some of the files are symlinks to ../tmp which we need
+	# to dereference first (see bug 432834).
+
+	local i
+
+	# Install binaries.
+	for i in bin/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dobin "${i}"
+	done
+
+	# Install headers.
+	insinto /usr/include/${P}
+	for i in include/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		doins "${i}"
+	done
+
+	# Install static libs. Charm has a lot of .o "libs" that it requires at
+	# runtime.
+	if use static-libs; then
+		for i in lib/*.{a,o}; do
+			if [[ -L ${i} ]]; then
+				i=$(readlink -e "${i}") || die
+			fi
+			dolib "${i}"
+		done
+	fi
+
+	# Install shared libs.
+	for i in lib_so/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dolib.so "${i}"
+	done
+
+	# Basic docs.
+	dodoc CHANGES README
+
+	# Install examples.
+	if use examples; then
+		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++/*
+	fi
+
+	# Install pdf/html docs
+	if use doc; then
+		cd "${S}/doc/charm++"
+		# Install pdfs.
+		insinto /usr/share/doc/${PF}/pdf
+		doins  *.pdf
+		# Install html.
+		docinto html
+		dohtml -r manual/*
+	fi
+}
+
+pkg_postinst() {
+	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'."
+}


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2014-02-20 18:54 Christoph Junghans
  0 siblings, 0 replies; 30+ messages in thread
From: Christoph Junghans @ 2014-02-20 18:54 UTC (permalink / raw
  To: gentoo-commits

commit:     9bb1bb60dd4a2d3cefb8720e76f6ccf04905e992
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 20 18:54:34 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Feb 20 18:54:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9bb1bb60

fixed build, gcc doesn't understand -j1

Package-Manager: portage-2.2.7

---
 sys-cluster/charm/ChangeLog              | 3 +++
 sys-cluster/charm/charm-6.6.0_rc2.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 7920664..551bcb4 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Feb 2014; Christoph Junghans <ottxor@gentoo.org> charm-6.6.0_rc2.ebuild:
+  fixed build, gcc doesn't understand -j1
+
 *charm-6.6.0_rc2 (19 Feb 2014)
 
   19 Feb 2014; Nicolas Bock <nicolasbock@gentoo.org> +charm-6.6.0_rc2.ebuild:

diff --git a/sys-cluster/charm/charm-6.6.0_rc2.ebuild b/sys-cluster/charm/charm-6.6.0_rc2.ebuild
index 5be505e..819fdbc 100644
--- a/sys-cluster/charm/charm-6.6.0_rc2.ebuild
+++ b/sys-cluster/charm/charm-6.6.0_rc2.ebuild
@@ -117,8 +117,8 @@ src_prepare() {
 src_compile() {
 	local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')"
 	local build_options="$(get_opts)"
-	local build_charmc_options="${MAKEOPTS} -j1"
-	local build_commandline="${build_version} ${build_options} ${build_charmc_options}"
+	#parallel build broken, just ignore MAKEOPTS
+	local build_commandline="${build_version} ${build_options}"
 
 	# Build charmm++ first.
 	einfo "running ./build charm++ ${build_commandline}"


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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
@ 2014-05-06  0:11 Christoph Junghans
  0 siblings, 0 replies; 30+ messages in thread
From: Christoph Junghans @ 2014-05-06  0:11 UTC (permalink / raw
  To: gentoo-commits

commit:     8c9dd17dc3a22bfe710c075a1079cf92ceb04375
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue May  6 00:03:26 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue May  6 00:11:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8c9dd17d

do not compress examples

Package-Manager: portage-2.2.8-r1

---
 sys-cluster/charm/ChangeLog              | 3 +++
 sys-cluster/charm/charm-6.6.0_rc2.ebuild | 1 +
 2 files changed, 4 insertions(+)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 551bcb4..9b9425c 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 May 2014; Christoph Junghans <ottxor@gentoo.org> charm-6.6.0_rc2.ebuild:
+  do not compress examples
+
   20 Feb 2014; Christoph Junghans <ottxor@gentoo.org> charm-6.6.0_rc2.ebuild:
   fixed build, gcc doesn't understand -j1
 

diff --git a/sys-cluster/charm/charm-6.6.0_rc2.ebuild b/sys-cluster/charm/charm-6.6.0_rc2.ebuild
index 819fdbc..604192e 100644
--- a/sys-cluster/charm/charm-6.6.0_rc2.ebuild
+++ b/sys-cluster/charm/charm-6.6.0_rc2.ebuild
@@ -199,6 +199,7 @@ src_install() {
 			die "Failed to fix examples"
 		insinto /usr/share/doc/${PF}/examples
 		doins -r examples/charm++/*
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 
 	# Install pdf/html docs


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

end of thread, other threads:[~2014-05-06  0:11 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-02 16:15 [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/ Nicolas Bock
  -- strict thread matches above, loose matches on Subject: below --
2014-05-06  0:11 Christoph Junghans
2014-02-20 18:54 Christoph Junghans
2014-02-19 21:54 Nicolas Bock
2014-01-06 21:46 Nicolas Bock
2014-01-03 15:29 Nicolas Bock
2014-01-02 16:55 Nicolas Bock
2013-12-13 19:12 Nicolas Bock
2013-11-22 16:42 Nicolas Bock
2013-11-20  4:47 Nicolas Bock
2013-10-18 20:33 Christoph Junghans
2013-10-01 15:41 Christoph Junghans
2013-09-27 20:07 Nicolas Bock
2013-09-27 18:18 Nicolas Bock
2013-09-27 17:36 Nicolas Bock
2013-09-11 17:28 Nicolas Bock
2013-07-03 16:43 Nicolas Bock
2013-07-03 16:41 Nicolas Bock
2013-07-02  3:32 Nicolas Bock
2013-06-26 21:55 Nicolas Bock
2013-06-26 20:38 Nicolas Bock
2013-06-26  5:04 Christoph Junghans
2013-06-24 21:43 Nicolas Bock
2013-06-24 21:33 Nicolas Bock
2013-06-06 15:57 Nicolas Bock
2013-05-31 15:30 Nicolas Bock
2013-05-31  4:33 Nicolas Bock
2013-05-31  4:33 Nicolas Bock
2013-05-30 21:40 Nicolas Bock
2013-05-30 19:18 Nicolas Bock

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