[gentoo-commits] proj/sci:master commit in: virtual/mpi/, sys-cluster/os-mpi/, profiles/updates/

[gentoo-commits] proj/sci:master commit in: virtual/mpi/, sys-cluster/os-mpi/, profiles/updates/

[Alexey Shvetsov]

commit:     7177aa9743b2b9072fcd5e198fb6d124151f872a
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  3 20:48:45 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Thu Mar  3 20:48:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7177aa97

os-mpi moved to tree as native-mpi

---
 profiles/updates/1Q-2011           |    1 +
 sys-cluster/os-mpi/metadata.xml    |    9 ---------
 sys-cluster/os-mpi/os-mpi-0.ebuild |   35 -----------------------------------
 virtual/mpi/mpi-2.0-r2.ebuild      |    2 +-
 4 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/profiles/updates/1Q-2011 b/profiles/updates/1Q-2011
index 98a3af9..5faa2ed 100644
--- a/profiles/updates/1Q-2011
+++ b/profiles/updates/1Q-2011
@@ -1 +1,2 @@
 move www-apps/SwishE www-apps/py-swish-e
+move sys-cluster/os-mpi sys-cluster/native-mpi

diff --git a/sys-cluster/os-mpi/metadata.xml b/sys-cluster/os-mpi/metadata.xml
deleted file mode 100644
index a70357e..0000000
--- a/sys-cluster/os-mpi/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>cluster</herd>
-	<maintainer>
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-</pkgmetadata>

diff --git a/sys-cluster/os-mpi/os-mpi-0.ebuild b/sys-cluster/os-mpi/os-mpi-0.ebuild
deleted file mode 100644
index 615cb69..0000000
--- a/sys-cluster/os-mpi/os-mpi-0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-DESCRIPTION="Use native os mpi in prefix envirement"
-HOMEPAGE="http://prefix.gentoo.org"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cat >> "${T}"/99mpi <<- EOF
-	MPI_CC=gcc
-	MPI_CXX=g++
-	MPI_FC=gfortran
-	MPI_F90=gfortran
-	HPMPI_F77=gfortran
-	EOF
-	doenvd "${T}"/99mpi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please read and edit ${EPREFIX}/etc/env.d/99mpi"
-	einfo "to add needed values for your os-mpi implentation"
-	einfo
-}

diff --git a/virtual/mpi/mpi-2.0-r2.ebuild b/virtual/mpi/mpi-2.0-r2.ebuild
index 7ea318f..9907d48 100644
--- a/virtual/mpi/mpi-2.0-r2.ebuild
+++ b/virtual/mpi/mpi-2.0-r2.ebuild
@@ -16,7 +16,7 @@ RDEPEND="|| (
 	sys-cluster/openmpi[cxx?,fortran?,romio?]
 	sys-cluster/mpich2[cxx?,fortran?,romio?]
 	sys-cluster/nullmpi
-	sys-cluster/os-mpi
+	sys-cluster/native-mpi
 )"
 
 DEPEND=""