From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1EB491381F3 for ; Thu, 11 Jul 2013 00:32:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBD2EE0968; Thu, 11 Jul 2013 00:32:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43363E0968 for ; Thu, 11 Jul 2013 00:32:41 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3114733E9B7 for ; Thu, 11 Jul 2013 00:32:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BEA5AE468F for ; Thu, 11 Jul 2013 00:32:38 +0000 (UTC) From: "Justin Bronder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Bronder" Message-ID: <1373502566.b28fbde3a4e784b4d5d182cc49daa2379c7f4194.jsbronder@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/empi/, sys-cluster/empi/files/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/empi/ChangeLog sys-cluster/empi/empi-0.10.ebuild sys-cluster/empi/empi-0.9.ebuild sys-cluster/empi/files/ChangeLog-0.10 sys-cluster/empi/files/ChangeLog-0.9 sys-cluster/empi/files/empi-0.10 sys-cluster/empi/files/empi-0.9 sys-cluster/empi/files/eselect.mpi-0.10 sys-cluster/empi/files/eselect.mpi-0.9 X-VCS-Directories: sys-cluster/empi/ sys-cluster/empi/files/ X-VCS-Committer: jsbronder X-VCS-Committer-Name: Justin Bronder X-VCS-Revision: b28fbde3a4e784b4d5d182cc49daa2379c7f4194 X-VCS-Branch: master Date: Thu, 11 Jul 2013 00:32:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 26bccae9-32ce-4600-b926-d65e45c30158 X-Archives-Hash: 9355de386f00197bb7378a5b5edc7e48 commit: b28fbde3a4e784b4d5d182cc49daa2379c7f4194 Author: Justin Bronder gentoo org> AuthorDate: Thu Jul 11 00:29:26 2013 +0000 Commit: Justin Bronder gentoo org> CommitDate: Thu Jul 11 00:29:26 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b28fbde3 bump Package-Manager: portage-2.1.12.2 RepoMan-Options: --force --- sys-cluster/empi/ChangeLog | 8 ++++ .../empi/{empi-0.9.ebuild => empi-0.10.ebuild} | 0 .../empi/files/{ChangeLog-0.9 => ChangeLog-0.10} | 55 +++++++++++++++++++++- sys-cluster/empi/files/{empi-0.9 => empi-0.10} | 11 +++-- .../files/{eselect.mpi-0.9 => eselect.mpi-0.10} | 0 5 files changed, 70 insertions(+), 4 deletions(-) diff --git a/sys-cluster/empi/ChangeLog b/sys-cluster/empi/ChangeLog index 067558d..214aaec 100644 --- a/sys-cluster/empi/ChangeLog +++ b/sys-cluster/empi/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*empi-0.10 (11 Jul 2013) + + 11 Jul 2013; Justin Bronder -empi-0.9.ebuild, + +empi-0.10.ebuild, -files/ChangeLog-0.9, -files/empi-0.9, + -files/eselect.mpi-0.9, +files/ChangeLog-0.10, +files/empi-0.10, + +files/eselect.mpi-0.10: + bump + 02 Jul 2013; Justin Lecher empi-0.9.ebuild, -files/ChangeLog-0.8, -files/eselect.mpi-0.8, +files/ChangeLog-0.9, +files/eselect.mpi-0.9: diff --git a/sys-cluster/empi/empi-0.9.ebuild b/sys-cluster/empi/empi-0.10.ebuild similarity index 100% rename from sys-cluster/empi/empi-0.9.ebuild rename to sys-cluster/empi/empi-0.10.ebuild diff --git a/sys-cluster/empi/files/ChangeLog-0.9 b/sys-cluster/empi/files/ChangeLog-0.10 similarity index 54% rename from sys-cluster/empi/files/ChangeLog-0.9 rename to sys-cluster/empi/files/ChangeLog-0.10 index 15652b0..ac5eff0 100644 --- a/sys-cluster/empi/files/ChangeLog-0.9 +++ b/sys-cluster/empi/files/ChangeLog-0.10 @@ -1,4 +1,57 @@ -commit a17e4452cb93014e2a4d5f7615e5d09f2df9c6a2 (HEAD, tag: v0.8, origin/master, origin/HEAD, master) +commit ab2dc2e2210f81d24b42180359d0842eb33f994a (HEAD, tag: v0.10, origin/master, origin/HEAD, master) +Author: Justin Bronder +Date: Wed Jul 10 20:22:13 2013 -0400 + + empi-0.10 + +commit d84c6ce3949f9eeeb1bab816e3e25eef0dd75661 +Author: Justin Bronder +Date: Tue Jul 9 18:48:01 2013 -0400 + + empi: support make.conf move + + Later versions of portage moved /etc/make.conf to /etc/portage/make.conf + by default while still supporting the old location. + +commit 914c277799fd0f44266864fa16fef338046be5f6 +Author: Justin Bronder +Date: Tue Jul 9 18:12:50 2013 -0400 + + eclass: add sys-cluster/mpich + + upstream renamed mpich2 to mpich. + +commit 5c80290f4f0d90fe84fa0f18f2264052c544c008 +Author: Justin Bronder +Date: Mon Jul 1 22:16:04 2013 -0400 + + Revert "eclass: workaround OpenMPI build issue #462602" + + This reverts commit 5e9b1be531ca02607e730a5b43765850eae9a0c5. + +commit a5d63455bf53a1ca6ab0220e3f308707a852b0cc (tag: v0.9) +Author: Justin Bronder +Date: Mon Jul 1 20:06:50 2013 -0400 + + empi-0.9 + +commit 4540a319542ddc7c0fbcea47174fe85e1810561c +Author: Justin Bronder +Date: Mon Jul 1 20:05:35 2013 -0400 + + empi: better filtering of emerge output + + Ignore extra information spit out by emerge, like news. + +commit 5e9b1be531ca02607e730a5b43765850eae9a0c5 +Author: Justin Bronder +Date: Mon Jul 1 20:04:58 2013 -0400 + + eclass: workaround OpenMPI build issue #462602 + + export FAKEROOTKEY=1 to stop OpenMPI from replacing malloc. + +commit a17e4452cb93014e2a4d5f7615e5d09f2df9c6a2 (tag: v0.8) Author: Justin Bronder Date: Thu Feb 21 22:56:27 2013 -0500 diff --git a/sys-cluster/empi/files/empi-0.9 b/sys-cluster/empi/files/empi-0.10 similarity index 98% rename from sys-cluster/empi/files/empi-0.9 rename to sys-cluster/empi/files/empi-0.10 index 8a9523c..cf41dbb 100755 --- a/sys-cluster/empi/files/empi-0.9 +++ b/sys-cluster/empi/files/empi-0.10 @@ -1,5 +1,5 @@ #!/bin/bash -VERSION=0.9 +VERSION=0.10 source /etc/init.d/functions.sh @@ -431,6 +431,7 @@ DO_EMERGE=1 EMERGE_OPTS="-u" # Packages can be recompiled by hand if necessary. TARGETS="" DEFAULT_MPI_OVERLAY_DIR=/var/cache/overlays/mpi +MAKE_CONF=/etc/make.conf PORTDIR_OVERLAY="" PKGDIR="" @@ -468,11 +469,15 @@ done [[ ${UID} -ne 0 ]] && die "You must be root to preform any actions." +if [ -s /etc/portage/make.conf ]; then + MAKE_CONF=/etc/portage/make.conf +fi + : ${MPI_OVERLAY_DIR:=$(portageq envvar MPI_OVERLAY_DIR)} if [ -z "${MPI_OVERLAY_DIR}" ]; then MPI_OVERLAY_DIR=${DEFAULT_MPI_OVERLAY_DIR} - einfo "MPI_OVERLAY_DIR not set, defaulting to ${MPI_OVERLAY_DIR} and updating /etc/make.conf" - echo "MPI_OVERLAY_DIR=\"${MPI_OVERLAY_DIR}\"" >> /etc/make.conf + einfo "MPI_OVERLAY_DIR not set, defaulting to ${MPI_OVERLAY_DIR} and updating make.conf" + echo "MPI_OVERLAY_DIR=\"${MPI_OVERLAY_DIR}\"" >> ${MAKE_CONF} fi if [ ! -d "${MPI_OVERLAY_DIR}" ]; then diff --git a/sys-cluster/empi/files/eselect.mpi-0.9 b/sys-cluster/empi/files/eselect.mpi-0.10 similarity index 100% rename from sys-cluster/empi/files/eselect.mpi-0.9 rename to sys-cluster/empi/files/eselect.mpi-0.10