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

["Nicolas Bock" <nicolasbock@gmail.com>]

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