* [gentoo-commits] proj/sci:master commit in: sys-cluster/mvapich2/, sys-cluster/openmpi/, sys-cluster/mvapich2/files/, ...
@ 2020-09-27 15:32 Aisha Tammy
0 siblings, 0 replies; only message in thread
From: Aisha Tammy @ 2020-09-27 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 7c67d4f1945c5407327f63d6e422e63069e5611c
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sun Sep 27 15:30:24 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Sun Sep 27 15:31:44 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7c67d4f1
sys-cluster/{mpich{,2},mvapich,openmpi}: drop packages
present in ::gentoo
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
sys-cluster/mpich/files/eselect.mpi.mpich | 8 -
sys-cluster/mpich/files/mpich-3.2.1-hwloc2.patch | 42 -----
sys-cluster/mpich/metadata.xml | 21 ---
sys-cluster/mpich/mpich-3.0.4.ebuild | 121 -------------
sys-cluster/mpich/mpich-3.1.3-r2.ebuild | 121 -------------
sys-cluster/mpich/mpich-3.1.4-r1.ebuild | 121 -------------
sys-cluster/mpich/mpich-3.2-r1.ebuild | 121 -------------
sys-cluster/mpich/mpich-3.2-r2.ebuild | 136 ---------------
sys-cluster/mpich/mpich-3.2.1.ebuild | 140 ---------------
.../0001-MPD_CONF_FILE-should-be-readable.patch | 32 ----
.../files/0002-mpd_conf_file-search-order.patch | 98 -----------
.../0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch | 36 ----
.../files/0003-Fix-pkgconfig-for-mpich2-ch3.patch | 36 ----
sys-cluster/mpich2/files/eselect.mpi.mpich2 | 8 -
.../mpich2/files/fix-pkg-config-files.patch | 119 -------------
sys-cluster/mpich2/files/mpd.conf | 2 -
.../mpich2-1.0.8-gforker-install-alt-fix.patch | 12 --
.../mpich2/files/mpich2-1.0.8-mpdconf-env.patch | 112 ------------
.../mpich2/files/mpich2-1.0.8-pkgconfig.patch | 17 --
.../files/mpich2-1.2.1-fix-missing-libs.patch | 33 ----
...2-1.3-libtvmpich2.so-respect-user-LDFLAGS.patch | 25 ---
sys-cluster/mpich2/files/mpich2-hvector.patch | 63 -------
sys-cluster/mpich2/metadata.xml | 21 ---
sys-cluster/mpich2/mpich2-1.5.ebuild | 127 --------------
sys-cluster/mvapich2/files/eselect.mpi.mvapich2 | 8 -
sys-cluster/mvapich2/metadata.xml | 16 --
sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild | 145 ---------------
sys-cluster/openmpi/files/eselect.mpi.openmpi | 8 -
...le-malloc-override-inside-of-Gentoo-sandb.patch | 42 -----
sys-cluster/openmpi/files/openmpi-ltdl.patch | 78 ---------
sys-cluster/openmpi/files/openmpi-r24328.patch | 54 ------
sys-cluster/openmpi/metadata.xml | 21 ---
sys-cluster/openmpi/openmpi-1.10.7.ebuild | 194 ---------------------
sys-cluster/openmpi/openmpi-1.8.8.ebuild | 180 -------------------
sys-cluster/openmpi/openmpi-2.0.4.ebuild | 177 -------------------
sys-cluster/openmpi/openmpi-2.1.6.ebuild | 176 -------------------
sys-cluster/openmpi/openmpi-3.0.4.ebuild | 173 ------------------
sys-cluster/openmpi/openmpi-3.1.4.ebuild | 173 ------------------
sys-cluster/openmpi/openmpi-4.0.1-r2.ebuild | 172 ------------------
39 files changed, 3189 deletions(-)
diff --git a/sys-cluster/mpich/files/eselect.mpi.mpich b/sys-cluster/mpich/files/eselect.mpi.mpich
deleted file mode 100644
index 703d71176..000000000
--- a/sys-cluster/mpich/files/eselect.mpi.mpich
+++ /dev/null
@@ -1,8 +0,0 @@
-MPI_CC=@ROOT@usr/bin/mpicc
-MPI_CXX=@ROOT@usr/bin/mpicxx
-MPI_F77=@ROOT@usr/bin/mpif77
-MPI_FC=@ROOT@usr/bin/mpif90
-CLASS_BASE_MPI_IMP=@BASE_IMP@
-PATH=@ROOT@usr/bin
-MANPATH=@ROOT@usr/share/man
-LD_LIBRARY_PATH=@ROOT@usr/@LIBDIR@
diff --git a/sys-cluster/mpich/files/mpich-3.2.1-hwloc2.patch b/sys-cluster/mpich/files/mpich-3.2.1-hwloc2.patch
deleted file mode 100644
index 415a40932..000000000
--- a/sys-cluster/mpich/files/mpich-3.2.1-hwloc2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ab59467c51206ac72546e4b734a1b41bf3d0345d Mon Sep 17 00:00:00 2001
-From: Kavitha Tiptur Madhu <kmadhu@anl.gov>
-Date: Fri, 19 Jan 2018 10:44:56 -0600
-Subject: [PATCH] hydra: remove replicate membind option
-
-The "replicate" option of membind is not well supported on a number of
-operating systems, and has been removed from hwloc (in v2.0) as well.
-This patch gets rid of that option in Hydra, in preparation for an
-upgrade to hwloc-2.0.
-
-Signed-off-by: Pavan Balaji <balaji@anl.gov>
----
- src/pm/hydra/tools/topo/hwloc/topo_hwloc.c | 3 ---
- src/pm/hydra/ui/mpich/utils.c | 1 -
- 2 files changed, 4 deletions(-)
-
-diff --git a/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c b/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c
-index ce15fe7702..74029fad61 100644
---- a/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c
-+++ b/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c
-@@ -424,9 +424,6 @@ HYD_status HYDT_topo_hwloc_init(const char *binding, const char *mapping, const
- else if (!strncmp(membind, "interleave:", strlen("interleave:"))) {
- HYDT_topo_hwloc_info.membind = HWLOC_MEMBIND_INTERLEAVE;
- }
-- else if (!strncmp(membind, "replicate:", strlen("replicate:"))) {
-- HYDT_topo_hwloc_info.membind = HWLOC_MEMBIND_REPLICATE;
-- }
- else {
- HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
- "unrecognized membind policy \"%s\"\n", membind);
-diff --git a/src/pm/hydra/ui/mpich/utils.c b/src/pm/hydra/ui/mpich/utils.c
-index 9e18a754b5..a9c9dde015 100644
---- a/src/pm/hydra/ui/mpich/utils.c
-+++ b/src/pm/hydra/ui/mpich/utils.c
-@@ -940,7 +940,6 @@ static void bind_to_help_fn(void)
- printf(" nexttouch -- closest to process that next touches memory\n");
- printf(" bind:<list> -- bind to memory node list\n");
- printf(" interleave:<list> -- interleave among memory node list\n");
-- printf(" replicate:<list> -- replicate among memory node list\n");
- }
-
- static HYD_status bind_to_fn(char *arg, char ***argv)
diff --git a/sys-cluster/mpich/metadata.xml b/sys-cluster/mpich/metadata.xml
deleted file mode 100644
index 6cbe440fa..000000000
--- a/sys-cluster/mpich/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>jsbronder@gentoo.org</email>
- <name>Justin Bronder</name>
- </maintainer>
- <maintainer type="person">
- <email>balaji@mcs.anl.gov</email>
- <name>Pavan Balaji</name>
- <description>Upstream Contact</description>
- </maintainer>
- <maintainer type="project">
- <email>cluster@gentoo.org</email>
- <name>Gentoo Cluster Project</name>
- </maintainer>
- <use>
- <flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
- <flag name="romio">Build the ROMIO MPI-IO component</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-cluster/mpich/mpich-3.0.4.ebuild b/sys-cluster/mpich/mpich-3.0.4.ebuild
deleted file mode 100644
index 6a32941cd..000000000
--- a/sys-cluster/mpich/mpich-3.0.4.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 mpi
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mpich.org/"
-SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cxx doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="
- dev-libs/libaio
- sys-apps/hwloc
- romio? ( net-fs/nfs-utils )
- $(mpi_imp_deplist)"
-
-DEPEND="${COMMON_DEPEND}
- dev-lang/perl
- sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_setup() {
- FORTRAN_STANDARD="77 90"
- fortran-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.mpich"
-
- if use mpi-threads && ! use threads; then
- ewarn "mpi-threads requires threads, assuming that's what you want"
- fi
-}
-
-src_prepare() {
- # Using MPICHLIB_LDFLAGS doesn't seem to fully work.
- sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
- src/packaging/pkgconfig/mpich.pc.in \
- src/env/*.in \
- || die
-}
-
-src_configure() {
- local c="--enable-shared"
-
- # The configure statements can be somewhat confusing, as they
- # don't all show up in the top level configure, however, they
- # are picked up in the children directories.
-
- if use mpi-threads; then
- # MPI-THREAD requries threading.
- c="${c} --with-thread-package=pthreads"
- c="${c} --enable-threads=runtime"
- else
- if use threads ; then
- c="${c} --with-thread-package=pthreads"
- else
- c="${c} --with-thread-package=none"
- fi
- c="${c} --enable-threads=single"
- fi
-
- if ! mpi_classed; then
- c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
- c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
- else
- c="${c} --docdir=$(mpi_root)/usr/share/doc/${PF}"
- fi
-
- export MPICHLIB_CFLAGS=${CFLAGS}
- export MPICHLIB_CPPFLAGS=${CPPFLAGS}
- export MPICHLIB_CXXFLAGS=${CXXFLAGS}
- export MPICHLIB_FFLAGS=${FFLAGS}
- export MPICHLIB_FCFLAGS=${FCFLAGS}
- export MPICHLIB_LDFLAGS=${LDFLAGS}
- unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
-
- econf $(mpi_econf_args) ${c} \
- --with-pm=hydra \
- --disable-mpe \
- --disable-fast \
- --enable-smpcoll \
- --enable-versioning \
- --with-hwloc-prefix=/usr \
- $(use_enable romio) \
- $(use_enable cxx) \
- $(use_enable fortran f77) \
- $(use_enable fortran fc)
-}
-
-src_test() {
- emake -j1 check
-}
-
-src_install() {
- local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
-
- default
-
- mpi_dodir /usr/share/doc/${PF}
- mpi_dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES
- mpi_newdoc src/pm/hydra/README README.hydra
- if use romio; then
- mpi_newdoc src/mpi/romio/README README.romio
- fi
-
- if ! use doc; then
- rm -rf "${d}"usr/share/doc/${PF}/www*
- fi
-
- mpi_imp_add_eselect
-}
diff --git a/sys-cluster/mpich/mpich-3.1.3-r2.ebuild b/sys-cluster/mpich/mpich-3.1.3-r2.ebuild
deleted file mode 100644
index 4657ded7f..000000000
--- a/sys-cluster/mpich/mpich-3.1.3-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 mpi
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mpich.org/"
-SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="
- dev-libs/libaio
- >=sys-apps/hwloc-1.9
- romio? ( net-fs/nfs-utils )
- $(mpi_imp_deplist)"
-
-DEPEND="${COMMON_DEPEND}
- dev-lang/perl
- sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_setup() {
- FORTRAN_STANDARD="77 90"
- fortran-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.mpich"
-
- if use mpi-threads && ! use threads; then
- ewarn "mpi-threads requires threads, assuming that's what you want"
- fi
-}
-
-src_prepare() {
- # Using MPICHLIB_LDFLAGS doesn't seem to fully work.
- sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
- src/packaging/pkgconfig/mpich.pc.in \
- src/env/*.in \
- || die
-}
-
-src_configure() {
- local c="--enable-shared"
-
- # The configure statements can be somewhat confusing, as they
- # don't all show up in the top level configure, however, they
- # are picked up in the children directories.
-
- if use mpi-threads; then
- # MPI-THREAD requries threading.
- c="${c} --with-thread-package=pthreads"
- c="${c} --enable-threads=runtime"
- else
- if use threads ; then
- c="${c} --with-thread-package=pthreads"
- else
- c="${c} --with-thread-package=none"
- fi
- c="${c} --enable-threads=single"
- fi
-
- if ! mpi_classed; then
- c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
- c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
- else
- c="${c} --docdir=$(mpi_root)/usr/share/doc/${PF}"
- fi
-
- export MPICHLIB_CFLAGS=${CFLAGS}
- export MPICHLIB_CPPFLAGS=${CPPFLAGS}
- export MPICHLIB_CXXFLAGS=${CXXFLAGS}
- export MPICHLIB_FFLAGS=${FFLAGS}
- export MPICHLIB_FCFLAGS=${FCFLAGS}
- export MPICHLIB_LDFLAGS=${LDFLAGS}
- unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
-
- econf $(mpi_econf_args) ${c} \
- --with-pm=hydra \
- --disable-mpe \
- --disable-fast \
- --enable-smpcoll \
- --enable-versioning \
- --with-hwloc-prefix=/usr \
- $(use_enable romio) \
- $(use_enable cxx) \
- $(use_enable fortran f77) \
- $(use_enable fortran fc)
-}
-
-src_test() {
- emake -j1 check
-}
-
-src_install() {
- local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
-
- default
-
- mpi_dodir /usr/share/doc/${PF}
- mpi_dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES
- mpi_newdoc src/pm/hydra/README README.hydra
- if use romio; then
- mpi_newdoc src/mpi/romio/README README.romio
- fi
-
- if ! use doc; then
- rm -rf "${d}"usr/share/doc/${PF}/www*
- fi
-
- mpi_imp_add_eselect
-}
diff --git a/sys-cluster/mpich/mpich-3.1.4-r1.ebuild b/sys-cluster/mpich/mpich-3.1.4-r1.ebuild
deleted file mode 100644
index 2db9c9e60..000000000
--- a/sys-cluster/mpich/mpich-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 mpi
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mpich.org/"
-SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="
- dev-libs/libaio
- >=sys-apps/hwloc-1.9
- romio? ( net-fs/nfs-utils )
- $(mpi_imp_deplist)"
-
-DEPEND="${COMMON_DEPEND}
- dev-lang/perl
- sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_setup() {
- FORTRAN_STANDARD="77 90"
- fortran-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.mpich"
-
- if use mpi-threads && ! use threads; then
- ewarn "mpi-threads requires threads, assuming that's what you want"
- fi
-}
-
-src_prepare() {
- # Using MPICHLIB_LDFLAGS doesn't seem to fully work.
- sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
- src/packaging/pkgconfig/mpich.pc.in \
- src/env/*.in \
- || die
-}
-
-src_configure() {
- local c="--enable-shared"
- local hydra_c="--with-hwloc-prefix=/usr"
-
- # The configure statements can be somewhat confusing, as they
- # don't all show up in the top level configure, however, they
- # are picked up in the children directories. Hence the separate
- # local vars.
-
- if use mpi-threads; then
- # MPI-THREAD requries threading.
- c="${c} --with-thread-package=pthreads"
- c="${c} --enable-threads=runtime"
- else
- if use threads ; then
- c="${c} --with-thread-package=pthreads"
- else
- c="${c} --with-thread-package=none"
- fi
- c="${c} --enable-threads=single"
- fi
-
- if ! mpi_classed; then
- c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
- c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
- else
- c="${c} --docdir=$(mpi_root)/usr/share/doc/${PF}"
- fi
-
- export MPICHLIB_CFLAGS=${CFLAGS}
- export MPICHLIB_CPPFLAGS=${CPPFLAGS}
- export MPICHLIB_CXXFLAGS=${CXXFLAGS}
- export MPICHLIB_FFLAGS=${FFLAGS}
- export MPICHLIB_FCFLAGS=${FCFLAGS}
- export MPICHLIB_LDFLAGS=${LDFLAGS}
- unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
-
- econf $(mpi_econf_args) ${c} \
- --with-pm=hydra \
- --disable-fast \
- --enable-versioning \
- ${hydra_c} \
- $(use_enable romio) \
- $(use_enable cxx) \
- $(use_enable fortran f77) \
- $(use_enable fortran fc)
-}
-
-src_test() {
- emake -j1 check
-}
-
-src_install() {
- local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
-
- default
-
- mpi_dodir /usr/share/doc/${PF}
- mpi_dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES
- mpi_newdoc src/pm/hydra/README README.hydra
- if use romio; then
- mpi_newdoc src/mpi/romio/README README.romio
- fi
-
- if ! use doc; then
- rm -rf "${d}"usr/share/doc/${PF}/www*
- fi
-
- mpi_imp_add_eselect
-}
diff --git a/sys-cluster/mpich/mpich-3.2-r1.ebuild b/sys-cluster/mpich/mpich-3.2-r1.ebuild
deleted file mode 100644
index 2db9c9e60..000000000
--- a/sys-cluster/mpich/mpich-3.2-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 mpi
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mpich.org/"
-SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="
- dev-libs/libaio
- >=sys-apps/hwloc-1.9
- romio? ( net-fs/nfs-utils )
- $(mpi_imp_deplist)"
-
-DEPEND="${COMMON_DEPEND}
- dev-lang/perl
- sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_setup() {
- FORTRAN_STANDARD="77 90"
- fortran-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.mpich"
-
- if use mpi-threads && ! use threads; then
- ewarn "mpi-threads requires threads, assuming that's what you want"
- fi
-}
-
-src_prepare() {
- # Using MPICHLIB_LDFLAGS doesn't seem to fully work.
- sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
- src/packaging/pkgconfig/mpich.pc.in \
- src/env/*.in \
- || die
-}
-
-src_configure() {
- local c="--enable-shared"
- local hydra_c="--with-hwloc-prefix=/usr"
-
- # The configure statements can be somewhat confusing, as they
- # don't all show up in the top level configure, however, they
- # are picked up in the children directories. Hence the separate
- # local vars.
-
- if use mpi-threads; then
- # MPI-THREAD requries threading.
- c="${c} --with-thread-package=pthreads"
- c="${c} --enable-threads=runtime"
- else
- if use threads ; then
- c="${c} --with-thread-package=pthreads"
- else
- c="${c} --with-thread-package=none"
- fi
- c="${c} --enable-threads=single"
- fi
-
- if ! mpi_classed; then
- c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
- c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
- else
- c="${c} --docdir=$(mpi_root)/usr/share/doc/${PF}"
- fi
-
- export MPICHLIB_CFLAGS=${CFLAGS}
- export MPICHLIB_CPPFLAGS=${CPPFLAGS}
- export MPICHLIB_CXXFLAGS=${CXXFLAGS}
- export MPICHLIB_FFLAGS=${FFLAGS}
- export MPICHLIB_FCFLAGS=${FCFLAGS}
- export MPICHLIB_LDFLAGS=${LDFLAGS}
- unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
-
- econf $(mpi_econf_args) ${c} \
- --with-pm=hydra \
- --disable-fast \
- --enable-versioning \
- ${hydra_c} \
- $(use_enable romio) \
- $(use_enable cxx) \
- $(use_enable fortran f77) \
- $(use_enable fortran fc)
-}
-
-src_test() {
- emake -j1 check
-}
-
-src_install() {
- local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
-
- default
-
- mpi_dodir /usr/share/doc/${PF}
- mpi_dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES
- mpi_newdoc src/pm/hydra/README README.hydra
- if use romio; then
- mpi_newdoc src/mpi/romio/README README.romio
- fi
-
- if ! use doc; then
- rm -rf "${d}"usr/share/doc/${PF}/www*
- fi
-
- mpi_imp_add_eselect
-}
diff --git a/sys-cluster/mpich/mpich-3.2-r2.ebuild b/sys-cluster/mpich/mpich-3.2-r2.ebuild
deleted file mode 100644
index dc2e80944..000000000
--- a/sys-cluster/mpich/mpich-3.2-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-
-inherit fortran-2 multilib-minimal mpi
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mpich.org/"
-SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="
- >=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
- >=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP}]
- romio? ( net-fs/nfs-utils )
- $(mpi_imp_deplist)"
-
-DEPEND="${COMMON_DEPEND}
- dev-lang/perl
- sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/mpicxx.h
- /usr/include/mpi.h
- /usr/include/opa_config.h
-)
-
-src_prepare() {
- default
-
- # Using MPICHLIB_LDFLAGS doesn't seem to fully work.
- sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
- src/packaging/pkgconfig/mpich.pc.in \
- src/env/*.in \
- || die
-}
-
-multilib_src_configure() {
- # The configure statements can be somewhat confusing, as they
- # don't all show up in the top level configure, however, they
- # are picked up in the children directories. Hence the separate
- # local vars.
-
- local c=
- if use mpi-threads; then
- # MPI-THREAD requries threading.
- c="${c} --with-thread-package=pthreads"
- c="${c} --enable-threads=runtime"
- else
- if use threads ; then
- c="${c} --with-thread-package=pthreads"
- else
- c="${c} --with-thread-package=none"
- fi
- c="${c} --enable-threads=single"
- fi
-
- if ! mpi_classed; then
- c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
- c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
- else
- c="${c} --docdir=$(mpi_root)/usr/share/doc/${PF}"
- fi
-
- export MPICHLIB_CFLAGS="${CFLAGS}"
- export MPICHLIB_CPPFLAGS="${CPPFLAGS}"
- export MPICHLIB_CXXFLAGS="${CXXFLAGS}"
- export MPICHLIB_FFLAGS="${FFLAGS}"
- export MPICHLIB_FCFLAGS="${FCFLAGS}"
- export MPICHLIB_LDFLAGS="${LDFLAGS}"
- unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
-
- ECONF_SOURCE=${S} econf $(mpi_econf_args) \
- --enable-shared \
- --with-hwloc-prefix="${EPREFIX}/usr" \
- ${c} \
- --with-pm=hydra \
- --disable-fast \
- --enable-versioning \
- $(use_enable romio) \
- $(use_enable cxx) \
- $(multilib_native_use_enable fortran fortran all)
-}
-
-multilib_src_test() {
- emake -j1 check
-}
-
-multilib_src_install() {
- default
-
- # fortran header cannot be wrapped (bug #540508), workaround part 1
- if multilib_is_native_abi && use fortran; then
- mkdir "${T}"/fortran || die
- mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die
- mv "${ED}"/$(mpi_root)/usr/include/*.mod "${T}"/fortran || die
- else
- # some fortran files get installed unconditionally
- rm "${ED}"/$(mpi_root)/usr/include/mpif* "${ED}"usr/include/*.mod || die
- fi
-}
-
-multilib_src_install_all() {
- # fortran header cannot be wrapped (bug #540508), workaround part 2
- if use fortran; then
- mv "${T}"/fortran/* "${ED}"/$(mpi_root)/usr/include || die
- fi
-
- mpi_dodir /usr/share/doc/${PF}
- mpi_dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES
- mpi_newdoc src/pm/hydra/README README.hydra
- if use romio; then
- mpi_newdoc src/mpi/romio/README README.romio
- fi
-
- local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
- if ! use doc; then
- rm -rf "${d}"usr/share/doc/${PF}/www* || die
- fi
-
- MPI_ESELECT_FILE="eselect.mpi.mpich"
- mpi_imp_add_eselect
-}
diff --git a/sys-cluster/mpich/mpich-3.2.1.ebuild b/sys-cluster/mpich/mpich-3.2.1.ebuild
deleted file mode 100644
index ae3166474..000000000
--- a/sys-cluster/mpich/mpich-3.2.1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-
-inherit fortran-2 multilib-minimal mpi
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mpich.org/"
-SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="
- >=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
- >=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP}]
- romio? ( net-fs/nfs-utils )
- $(mpi_imp_deplist)"
-
-DEPEND="${COMMON_DEPEND}
- dev-lang/perl
- sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-hwloc2.patch"
-)
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/mpicxx.h
- /usr/include/mpi.h
- /usr/include/opa_config.h
-)
-
-src_prepare() {
- default
-
- # Using MPICHLIB_LDFLAGS doesn't seem to fully work.
- sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
- src/packaging/pkgconfig/mpich.pc.in \
- src/env/*.in \
- || die
-}
-
-multilib_src_configure() {
- # The configure statements can be somewhat confusing, as they
- # don't all show up in the top level configure, however, they
- # are picked up in the children directories. Hence the separate
- # local vars.
-
- local c=
- if use mpi-threads; then
- # MPI-THREAD requries threading.
- c="${c} --with-thread-package=pthreads"
- c="${c} --enable-threads=runtime"
- else
- if use threads ; then
- c="${c} --with-thread-package=pthreads"
- else
- c="${c} --with-thread-package=none"
- fi
- c="${c} --enable-threads=single"
- fi
-
- if ! mpi_classed; then
- c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
- c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
- else
- c="${c} --docdir=$(mpi_root)/usr/share/doc/${PF}"
- fi
-
- export MPICHLIB_CFLAGS="${CFLAGS}"
- export MPICHLIB_CPPFLAGS="${CPPFLAGS}"
- export MPICHLIB_CXXFLAGS="${CXXFLAGS}"
- export MPICHLIB_FFLAGS="${FFLAGS}"
- export MPICHLIB_FCFLAGS="${FCFLAGS}"
- export MPICHLIB_LDFLAGS="${LDFLAGS}"
- unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
-
- ECONF_SOURCE=${S} econf $(mpi_econf_args) \
- --enable-shared \
- --with-hwloc-prefix="${EPREFIX}/usr" \
- ${c} \
- --with-pm=hydra \
- --disable-fast \
- --enable-versioning \
- $(use_enable romio) \
- $(use_enable cxx) \
- $(multilib_native_use_enable fortran fortran all)
-}
-
-multilib_src_test() {
- emake -j1 check
-}
-
-multilib_src_install() {
- default
-
- # fortran header cannot be wrapped (bug #540508), workaround part 1
- if multilib_is_native_abi && use fortran; then
- mkdir "${T}"/fortran || die
- mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die
- mv "${ED}"/$(mpi_root)/usr/include/*.mod "${T}"/fortran || die
- else
- # some fortran files get installed unconditionally
- rm "${ED}"/$(mpi_root)/usr/include/mpif* "${ED}"usr/include/*.mod || die
- fi
-}
-
-multilib_src_install_all() {
- # fortran header cannot be wrapped (bug #540508), workaround part 2
- if use fortran; then
- mv "${T}"/fortran/* "${ED}"/$(mpi_root)/usr/include || die
- fi
-
- mpi_dodir /usr/share/doc/${PF}
- mpi_dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES
- mpi_newdoc src/pm/hydra/README README.hydra
- if use romio; then
- mpi_newdoc src/mpi/romio/README README.romio
- fi
-
- local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
- if ! use doc; then
- rm -rf "${d}"usr/share/doc/${PF}/www* || die
- fi
-
- MPI_ESELECT_FILE="eselect.mpi.mpich"
- mpi_imp_add_eselect
-}
diff --git a/sys-cluster/mpich2/files/0001-MPD_CONF_FILE-should-be-readable.patch b/sys-cluster/mpich2/files/0001-MPD_CONF_FILE-should-be-readable.patch
deleted file mode 100644
index fa685e364..000000000
--- a/sys-cluster/mpich2/files/0001-MPD_CONF_FILE-should-be-readable.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4daa0519150f38bd322964157157fb3369ee0f38 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Wed, 16 Sep 2009 11:43:59 -0400
-Subject: [PATCH 1/3] MPD_CONF_FILE should be readable
-
-When looking for the MPD_CONF_FILE, the existance is not enough, the
-file also needs to be readable by the current user.
----
- src/pm/mpd/mpdlib.py | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/pm/mpd/mpdlib.py b/src/pm/mpd/mpdlib.py
-index 8ea8a05..31ddcb4 100644
---- a/src/pm/mpd/mpdlib.py
-+++ b/src/pm/mpd/mpdlib.py
-@@ -1359,11 +1359,11 @@ class MPDParmDB(dict):
- if os.environ.has_key(k):
- self[('env',k)] = os.environ[k]
- def get_parms_from_rcfile(self,parmsToOverride,errIfMissingFile=0):
-- if os.environ.has_key('MPD_CONF_FILE'):
-+ if os.environ.has_key('MPD_CONF_FILE') and os.access(os.environ['MPD_CONF_FILE'], os.R_OK):
- parmsRCFilename = os.environ['MPD_CONF_FILE']
- elif hasattr(os,'getuid') and os.getuid() == 0: # if ROOT
- parmsRCFilename = os.path.abspath('/etc/mpd.conf')
-- elif os.environ.has_key('HOME'):
-+ elif os.environ.has_key('HOME') and os.access(os.path.join(os.environ['HOME'], '.mpd.conf'), os.R_OK):
- parmsRCFilename = os.path.join(os.environ['HOME'],'.mpd.conf')
- elif os.environ.has_key('HOMEPATH'): # e.g. win32
- parmsRCFilename = os.path.join(os.environ['HOMEPATH'],'.mpd.conf')
---
-1.6.3.3
-
diff --git a/sys-cluster/mpich2/files/0002-mpd_conf_file-search-order.patch b/sys-cluster/mpich2/files/0002-mpd_conf_file-search-order.patch
deleted file mode 100644
index 2bb59e7c2..000000000
--- a/sys-cluster/mpich2/files/0002-mpd_conf_file-search-order.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From c5c6b5677854d2e835ed7d8d0497ab4f475c63fc Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Wed, 16 Sep 2009 11:50:20 -0400
-Subject: [PATCH 2/3] mpd_conf_file search order.
-
-Make sure the search order for mpd.conf is the following:
- - MPD_CONF_FILE set in environment
- - .mpd.conf in the user's home directory
- - The system wide default in SYSCONFDIR/mpd.conf
----
- src/pm/mpd/Makefile.in | 9 ++++++---
- src/pm/mpd/mpdroot.c | 27 +++++++++++++++++++++++++--
- 2 files changed, 31 insertions(+), 5 deletions(-)
-
-diff --git a/src/pm/mpd/Makefile.in b/src/pm/mpd/Makefile.in
-index e1752f8..4ef65fc 100644
---- a/src/pm/mpd/Makefile.in
-+++ b/src/pm/mpd/Makefile.in
-@@ -74,7 +74,7 @@ mpdroot: ${mpdroot_OBJECTS}
- $(C_LINK) -o mpdroot ${mpdroot_OBJECTS} $(LIBS)
-
- mpdroot.o: ${srcdir}/mpdroot.c ${srcdir}/mpdroot.h mpdconf.h
-- ${C_COMPILE} -c $<
-+ ${C_COMPILE} -DSYSCONFDIR=\"@sysconfdir@\" -c $<
-
- # The following lines provide the right libraries for all example programs
- .c:
-@@ -128,7 +128,10 @@ install: all
- @echo "copying python files/links into " $(DESTDIR)${bindir}
- -@for cmd in ${PYTHON_SOURCE} ; do \
- if [ ! -s $(srcdir)/$$cmd.py ] ; then continue ; fi ; \
-- sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
-+ sed \
-+ -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' \
-+ -e 's,/etc/mpd.conf,@sysconfdir@/mpd.conf,g' \
-+ ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
- ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
- ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \
- done
-@@ -210,7 +213,7 @@ mpich2-mpdroot: mpich2-mpdroot.o
-
- mpich2-mpdroot.o: ${srcdir}/mpdroot.c ${srcdir}/mpdroot.h mpdconf.h
- ${INSTALL} -m 644 ${srcdir}/mpdroot.c mpich2-mpdroot.c
-- ${C_COMPILE} -c mpich2-mpdroot.c
-+ ${C_COMPILE} -DSYSCONFDIR=\"@sysconfdir@\" -c mpich2-mpdroot.c
- rm -f mpich2-mpdroot.c
-
- # A special alternate installation target when using multiple process managers
-diff --git a/src/pm/mpd/mpdroot.c b/src/pm/mpd/mpdroot.c
-index 348c7b6..1a4f2a5 100644
---- a/src/pm/mpd/mpdroot.c
-+++ b/src/pm/mpd/mpdroot.c
-@@ -19,6 +19,7 @@ int main(int argc, char *argv[])
- struct passwd *pwent;
- char input_line[NAME_LEN+1], secretword[NAME_LEN+1];
- FILE *conf_file;
-+ char *mpdconf_path = NULL;
-
- if ((pwent = getpwuid(getuid())) == NULL) /* for real id */
- {
-@@ -26,10 +27,32 @@ int main(int argc, char *argv[])
- exit(-1);
- }
-
-- conf_file = fopen("/etc/mpd.conf","r");
-+ /*
-+ * We look for a readable mpd.conf in the following order.
-+ * - MPD_CONF_FILE set in environment
-+ * - .mpd.conf in the user's home directory
-+ * - The system wide default in SYSCONFDIR/mpd.conf
-+ */
-+ mpdconf_path = getenv("MPD_CONF_FILE");
-+ if ( ! (mpdconf_path && access( mpdconf_path, R_OK ) == 0) ){
-+ /* By far, the largest we'll need */
-+ size_t mpdconf_path_len = strlen(pwent->pw_dir) \
-+ + strlen(SYSCONFDIR) + strlen("/.mpd.conf");
-+
-+ mpdconf_path = (char*) malloc( sizeof(char) * mpdconf_path_len );
-+ if ( ! mpdconf_path ){
-+ fprintf( stderr, "%s: Failed to allocate a buffer for path to mpd.conf\n", argv[0]);
-+ exit(-1);
-+ }
-+ snprintf( mpdconf_path, mpdconf_path_len-1, "%s/.mpd.conf", pwent->pw_dir );
-+ if ( access( mpdconf_path, R_OK ) != 0 )
-+ snprintf( mpdconf_path, mpdconf_path_len-1, "%s/mpd.conf", SYSCONFDIR );
-+ }
-+ conf_file = fopen( mpdconf_path, "r");
-+
- if (conf_file == NULL)
- {
-- printf("%s: open failed for root's mpd conf file",argv[0]);
-+ printf("%s: open failed for root's mpd conf file\n",argv[0]);
- exit(-1);
- }
- secretword[0] = '\0';
---
-1.6.3.3
-
diff --git a/sys-cluster/mpich2/files/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch b/sys-cluster/mpich2/files/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch
deleted file mode 100644
index 266990c0b..000000000
--- a/sys-cluster/mpich2/files/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6572e098d5463bdcdcb9563ee9a736efed4a01c9 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Tue, 24 Nov 2009 10:27:51 -0500
-Subject: [PATCH] Fix pkgconfig for mpich2-ch3 v1.2.1
-
-Variables were undefined, see http://bugs.gentoo.org/257821
-
-$ pkg-config --list-all
-[lots of output, then]
-Variable 'exec_prefix' not defined in '/usr/lib/pkgconfig/mpich2-ch3.pc'
----
- src/packaging/pkgconfig/mpich2-ch3.pc.in | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/packaging/pkgconfig/mpich2-ch3.pc.in b/src/packaging/pkgconfig/mpich2-ch3.pc.in
-index b061464..275b535 100644
---- a/src/packaging/pkgconfig/mpich2-ch3.pc.in
-+++ b/src/packaging/pkgconfig/mpich2-ch3.pc.in
-@@ -1,8 +1,12 @@
- # this gives access to the mpich2 header files
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-
- Name: mpich2
- Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
- Version: @MPICH2_VERSION@
- Requires:
--Libs: -L@libdir@ -lmpich -lmpichcxx -lopa @LIBS@
--Cflags: @CFLAGS@ -I@includedir@ -DMPICH_IGNORE_CXX_SEEK
-+Libs: -L${libdir} -lmpich -lmpichcxx -lopa @LIBS@
-+Cflags: @CFLAGS@ -I${includedir} -DMPICH_IGNORE_CXX_SEEK
---
-1.6.3.3
-
diff --git a/sys-cluster/mpich2/files/0003-Fix-pkgconfig-for-mpich2-ch3.patch b/sys-cluster/mpich2/files/0003-Fix-pkgconfig-for-mpich2-ch3.patch
deleted file mode 100644
index 04be31337..000000000
--- a/sys-cluster/mpich2/files/0003-Fix-pkgconfig-for-mpich2-ch3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 06eaaf72d12ca70275fd4f403af14bcb2d609718 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Wed, 16 Sep 2009 11:59:57 -0400
-Subject: [PATCH 3/3] Fix pkgconfig for mpich2-ch3
-
-Variables were undefined, see http://bugs.gentoo.org/257821
-
-$ pkg-config --list-all
-[lots of output, then]
-Variable 'exec_prefix' not defined in '/usr/lib/pkgconfig/mpich2-ch3.pc'
----
- src/packaging/pkgconfig/mpich2-ch3.pc.in | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/packaging/pkgconfig/mpich2-ch3.pc.in b/src/packaging/pkgconfig/mpich2-ch3.pc.in
-index df10b7f..8621ef5 100644
---- a/src/packaging/pkgconfig/mpich2-ch3.pc.in
-+++ b/src/packaging/pkgconfig/mpich2-ch3.pc.in
-@@ -1,8 +1,12 @@
- # this gives access to the mpich2 header files
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-
- Name: mpich2
- Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
- Version: @VERSION@
- Requires:
--Libs: -L@libdir@ -lmpich -lmpichcxx @LIBS@
--Cflags: @CFLAGS@ -I@includedir@ -DMPICH_IGNORE_CXX_SEEK
-+Libs: -L${libdir} -lmpich -lmpichcxx @LIBS@
-+Cflags: @CFLAGS@ -I${includedir} -DMPICH_IGNORE_CXX_SEEK
---
-1.6.3.3
-
diff --git a/sys-cluster/mpich2/files/eselect.mpi.mpich2 b/sys-cluster/mpich2/files/eselect.mpi.mpich2
deleted file mode 100644
index 703d71176..000000000
--- a/sys-cluster/mpich2/files/eselect.mpi.mpich2
+++ /dev/null
@@ -1,8 +0,0 @@
-MPI_CC=@ROOT@usr/bin/mpicc
-MPI_CXX=@ROOT@usr/bin/mpicxx
-MPI_F77=@ROOT@usr/bin/mpif77
-MPI_FC=@ROOT@usr/bin/mpif90
-CLASS_BASE_MPI_IMP=@BASE_IMP@
-PATH=@ROOT@usr/bin
-MANPATH=@ROOT@usr/share/man
-LD_LIBRARY_PATH=@ROOT@usr/@LIBDIR@
diff --git a/sys-cluster/mpich2/files/fix-pkg-config-files.patch b/sys-cluster/mpich2/files/fix-pkg-config-files.patch
deleted file mode 100644
index d9c311e31..000000000
--- a/sys-cluster/mpich2/files/fix-pkg-config-files.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From cba731049a24735beb660dc236f61070aa6e387a Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Thu, 5 Jan 2012 22:20:31 -0500
-Subject: [PATCH] fix pkg config files
-
-Conditionals are not supported.
-https://trac.mcs.anl.gov/projects/mpich2/ticket/1044
----
- configure.in | 6 ++++++
- src/packaging/pkgconfig/mpich2-c.pc.in | 8 +-------
- src/packaging/pkgconfig/mpich2-cxx.pc.in | 8 +-------
- src/packaging/pkgconfig/mpich2-f77.pc.in | 8 +-------
- src/packaging/pkgconfig/mpich2-f90.pc.in | 8 +-------
- 5 files changed, 10 insertions(+), 28 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 294dc85..44b1010 100644
---- a/configure.in
-+++ b/configure.in
-@@ -5332,6 +5332,12 @@ AC_SUBST(MPICH_TIMER_KIND)
- # Setup other replaceable values
- AC_SUBST(MPILIBNAME)
- AC_SUBST(PMPILIBNAME)
-+PKGCONFIG_PMPILIB=""
-+if test "$NEEDSPLIB" = yes -a test -n "${PMPILIBNAME}" ; then
-+ PKGCONFIG_PMPILIB="-l${PMPILIBNAME}"
-+fi
-+AC_SUBST(PKGCONFIG_PMPILIB)
-+
- # Note that aint_size must be used instead of void_p where the desired check
- # is on the size of MPI_Aint
- aint_size=$ac_cv_sizeof_void_p
-diff --git a/src/packaging/pkgconfig/mpich2-c.pc.in b/src/packaging/pkgconfig/mpich2-c.pc.in
-index 394630b..e0ab3fa 100644
---- a/src/packaging/pkgconfig/mpich2-c.pc.in
-+++ b/src/packaging/pkgconfig/mpich2-c.pc.in
-@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
-
--if test "@NEEDSPLIB@" = "yes" ; then
-- plib=@PMPILIBNAME@
--else
-- plib=
--fi
--
- Name: mpich2
- Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
- Version: @MPICH2_VERSION@
- Requires:
--Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
-+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
- Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir}
-diff --git a/src/packaging/pkgconfig/mpich2-cxx.pc.in b/src/packaging/pkgconfig/mpich2-cxx.pc.in
-index 936ade6..d82e184 100644
---- a/src/packaging/pkgconfig/mpich2-cxx.pc.in
-+++ b/src/packaging/pkgconfig/mpich2-cxx.pc.in
-@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
-
--if test "@NEEDSPLIB@" = "yes" ; then
-- plib=@PMPILIBNAME@
--else
-- plib=
--fi
--
- Name: mpich2
- Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
- Version: @MPICH2_VERSION@
- Requires:
--Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
-+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
- Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir}
-diff --git a/src/packaging/pkgconfig/mpich2-f77.pc.in b/src/packaging/pkgconfig/mpich2-f77.pc.in
-index 291462e..193c2ab 100644
---- a/src/packaging/pkgconfig/mpich2-f77.pc.in
-+++ b/src/packaging/pkgconfig/mpich2-f77.pc.in
-@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
-
--if test "@NEEDSPLIB@" = "yes" ; then
-- plib=@PMPILIBNAME@
--else
-- plib=
--fi
--
- Name: mpich2
- Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
- Version: @MPICH2_VERSION@
- Requires:
--Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
-+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
- Fflags: @WRAPPER_FFLAGS@ -I${includedir}
-diff --git a/src/packaging/pkgconfig/mpich2-f90.pc.in b/src/packaging/pkgconfig/mpich2-f90.pc.in
-index ca15e18..700976f 100644
---- a/src/packaging/pkgconfig/mpich2-f90.pc.in
-+++ b/src/packaging/pkgconfig/mpich2-f90.pc.in
-@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
-
--if test "@NEEDSPLIB@" = "yes" ; then
-- plib=@PMPILIBNAME@
--else
-- plib=
--fi
--
- Name: mpich2
- Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
- Version: @MPICH2_VERSION@
- Requires:
--Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
-+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
- Fcflags: @WRAPPER_FCFLAGS@ -I${includedir}
---
-1.7.3.4
-
diff --git a/sys-cluster/mpich2/files/mpd.conf b/sys-cluster/mpich2/files/mpd.conf
deleted file mode 100644
index 07dd98250..000000000
--- a/sys-cluster/mpich2/files/mpd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-secretword=test69hike
-MPD_SECRETWORD=test69hike
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.8-gforker-install-alt-fix.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-gforker-install-alt-fix.patch
deleted file mode 100644
index 00774049f..000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.8-gforker-install-alt-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mpich2-1.0.8/src/pm/gforker/Makefile.in-orig 2008-11-01 13:18:37.685990975 -0400
-+++ mpich2-1.0.8/src/pm/gforker/Makefile.in 2008-11-01 13:19:03.584804978 -0400
-@@ -176,6 +176,9 @@
-
- # A special alternate installation target when using multiple process managers
- install-alt: mpiexec
-+ if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi
-+ if [ ! -d ${DESTDIR}${prefix} ] ; then $(MKDIR_P) ${DESTDIR}${prefix} ; fi
-+ if [ ! -d ${DESTDIR}${bindir} ] ; then $(MKDIR_P) ${DESTDIR}${bindir} ; fi
- $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpiexec $(DESTDIR)${bindir}/mpiexec.gforker
-
-
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.8-mpdconf-env.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-mpdconf-env.patch
deleted file mode 100644
index af3bbb239..000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.8-mpdconf-env.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -urN a/mpich2-1.0.8/src/pm/mpd/Makefile.in b/mpich2-1.0.8/src/pm/mpd/Makefile.in
---- a/mpich2-1.0.8/src/pm/mpd/Makefile.in 2008-09-17 16:40:53.000000000 -0400
-+++ b/mpich2-1.0.8/src/pm/mpd/Makefile.in 2009-04-01 16:38:02.236018295 -0400
-@@ -74,7 +74,7 @@
- $(C_LINK) -o mpdroot ${mpdroot_OBJECTS} $(LIBS)
-
- mpdroot.o: ${srcdir}/mpdroot.c ${srcdir}/mpdroot.h mpdconf.h
-- ${C_COMPILE} -c $<
-+ ${C_COMPILE} -DSYSCONFDIR=\"@sysconfdir@\" -c $<
-
- # The following lines provide the right libraries for all example programs
- .c:
-@@ -128,8 +128,11 @@
- @echo "copying python files/links into " $(DESTDIR)${bindir}
- -@for cmd in ${PYTHON_SOURCE} ; do \
- if [ ! -s $(srcdir)/$$cmd.py ] ; then continue ; fi ; \
-- sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
-- ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
-+ sed \
-+ -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' \
-+ -e 's,/etc/mpd.conf,@sysconfdir@/mpd.conf,g' \
-+ ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
-+ ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
- ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \
- done
- -@cd $(DESTDIR)${bindir} && rm -f mpd
-@@ -210,7 +213,7 @@
-
- mpich2-mpdroot.o: ${srcdir}/mpdroot.c ${srcdir}/mpdroot.h mpdconf.h
- ${INSTALL} -m 644 ${srcdir}/mpdroot.c mpich2-mpdroot.c
-- ${C_COMPILE} -c mpich2-mpdroot.c
-+ ${C_COMPILE} -DSYSCONFDIR=\"@sysconfdir@\" -c mpich2-mpdroot.c
- rm -f mpich2-mpdroot.c
-
- # A special alternate installation target when using multiple process managers
-@@ -226,8 +229,11 @@
- fi
- for cmd in ${PYTHON_SOURCE} ; do \
- if [ ! -s $(srcdir)/$$cmd.py ] ; then continue ; fi ; \
-- sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
-- ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
-+ sed \
-+ -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' \
-+ -e 's,/etc/mpd.conf,@sysconfdir@/mpd.conf,g' \
-+ ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
-+ ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
- ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \
- done
- cd $(DESTDIR)${bindir} && rm -f mpd
-diff -urN a/mpich2-1.0.8/src/pm/mpd/mpdlib.py b/mpich2-1.0.8/src/pm/mpd/mpdlib.py
---- a/mpich2-1.0.8/src/pm/mpd/mpdlib.py 2007-11-08 18:47:44.000000000 -0500
-+++ b/mpich2-1.0.8/src/pm/mpd/mpdlib.py 2009-04-01 16:35:08.899627072 -0400
-@@ -1341,11 +1341,11 @@
- if os.environ.has_key(k):
- self[('env',k)] = os.environ[k]
- def get_parms_from_rcfile(self,parmsToOverride,errIfMissingFile=0):
-- if os.environ.has_key('MPD_CONF_FILE'):
-+ if os.environ.has_key('MPD_CONF_FILE') and os.access(os.environ['MPD_CONF_FILE'], os.R_OK):
- parmsRCFilename = os.environ['MPD_CONF_FILE']
- elif hasattr(os,'getuid') and os.getuid() == 0: # if ROOT
- parmsRCFilename = os.path.abspath('/etc/mpd.conf')
-- elif os.environ.has_key('HOME'):
-+ elif os.environ.has_key('HOME') and os.access(os.path.join(os.environ['HOME'],'.mpd.conf'), os.R_OK):
- parmsRCFilename = os.path.join(os.environ['HOME'],'.mpd.conf')
- elif os.environ.has_key('HOMEPATH'): # e.g. win32
- parmsRCFilename = os.path.join(os.environ['HOMEPATH'],'.mpd.conf')
-diff -urN a/mpich2-1.0.8/src/pm/mpd/mpdroot.c b/mpich2-1.0.8/src/pm/mpd/mpdroot.c
---- a/mpich2-1.0.8/src/pm/mpd/mpdroot.c 2007-11-02 18:50:19.000000000 -0400
-+++ b/mpich2-1.0.8/src/pm/mpd/mpdroot.c 2009-04-01 16:35:08.899627072 -0400
-@@ -19,6 +19,7 @@
- struct passwd *pwent;
- char input_line[NAME_LEN+1], secretword[NAME_LEN+1];
- FILE *conf_file;
-+ char *mpdconf_path = NULL;
-
- if ((pwent = getpwuid(getuid())) == NULL) /* for real id */
- {
-@@ -26,10 +27,32 @@
- exit(-1);
- }
-
-- conf_file = fopen("/etc/mpd.conf","r");
-+ /*
-+ * We look for a readable mpd.conf in the following order.
-+ * - MPD_CONF_FILE set in environment
-+ * - .mpd.conf in the user's home directory
-+ * - The system wide default in SYSCONFDIR/mpd.conf
-+ */
-+ mpdconf_path = getenv("MPD_CONF_FILE");
-+ if ( ! (mpdconf_path && access( mpdconf_path, R_OK ) == 0) ){
-+ /* By far, the largest we'll need */
-+ size_t mpdconf_path_len = strlen(pwent->pw_dir) \
-+ + strlen(SYSCONFDIR) + strlen("/.mpd.conf");
-+
-+ mpdconf_path = (char*) malloc( sizeof(char) * mpdconf_path_len );
-+ if ( ! mpdconf_path ){
-+ fprintf( stderr, "%s: Failed to allocate a buffer for path to mpd.conf\n", argv[0]);
-+ exit(-1);
-+ }
-+ snprintf( mpdconf_path, mpdconf_path_len-1, "%s/.mpd.conf", pwent->pw_dir );
-+ if ( access( mpdconf_path, R_OK ) != 0 )
-+ snprintf( mpdconf_path, mpdconf_path_len-1, "%s/mpd.conf", SYSCONFDIR );
-+ }
-+ conf_file = fopen( mpdconf_path, "r");
-+
- if (conf_file == NULL)
- {
-- printf("%s: open failed for root's mpd conf file",argv[0]);
-+ printf("%s: open failed for root's mpd conf file\n",argv[0]);
- exit(-1);
- }
- secretword[0] = '\0';
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.8-pkgconfig.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-pkgconfig.patch
deleted file mode 100644
index 1d3a456bd..000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.8-pkgconfig.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/mpich2-1.0.8/src/pkgconfig/mpich2-ch3.pc.in 2008-11-04 20:36:38.931970012 -0500
-+++ b/mpich2-1.0.8/src/pkgconfig/mpich2-ch3.pc.in 2009-02-11 21:39:00.279871039 -0500
-@@ -1,8 +1,12 @@
- # this gives access to the mpich2 header files
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-
- Name: mpich2
- Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
- Version: @VERSION@
- Requires:
--Libs: -L@libdir@ -lmpich -lmpichcxx @LIBS@
--Cflags: @CFLAGS@ -I@includedir@ -DMPICH_IGNORE_CXX_SEEK
-+Libs: -L${libdir} -lmpich -lmpichcxx @LIBS@
-+Cflags: @CFLAGS@ -I${includedir} -DMPICH_IGNORE_CXX_SEEK
diff --git a/sys-cluster/mpich2/files/mpich2-1.2.1-fix-missing-libs.patch b/sys-cluster/mpich2/files/mpich2-1.2.1-fix-missing-libs.patch
deleted file mode 100644
index 1f2ba04cf..000000000
--- a/sys-cluster/mpich2/files/mpich2-1.2.1-fix-missing-libs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 94707148dc8c33a1d3245e1f0dd7e28542f91e75 Mon Sep 17 00:00:00 2001
-From: Steve Arnold <nerdboy@gentoo.org>
-Date: Wed, 4 Aug 2010 23:34:06 -0400
-Subject: [PATCH] Added missing library references for the f90 and C++ shared libraries
-
-Backport of upstream r6848. Directly modifies the Makefile.in to avoid
-having to call simplemake to regenerate the entire build system.
-
-http://trac.mcs.anl.gov/projects/mpich2/changeset/6848
----
- Makefile.in | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index cbe4a93..d12babb 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -143,10 +143,10 @@ lib/libf${MPILIBNAME}.@SHLIB_EXT@: lib/libf${MPILIBNAME}.la
- (cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o libf${MPILIBNAME}.la -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS))
- # Build the shared library from the shared object files
- lib/lib${MPILIBNAME}f90.@SHLIB_EXT@: lib/lib${MPILIBNAME}f90.la
-- (cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}f90.la -rpath $(libdir) -ldflags "$(LDFLAGS)" $(LIBS))
-+ (cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}f90.la -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS))
- # Build the shared library from the shared object files
- lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@: lib/lib${MPICXXLIBNAME}.la
-- (cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la -rpath $(libdir) -ldflags "$(LDFLAGS)" $(LIBS))
-+ (cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS))
-
- # --------------------------------------------------------------------------
- .libstamp0:
---
-1.7.1
-
diff --git a/sys-cluster/mpich2/files/mpich2-1.3-libtvmpich2.so-respect-user-LDFLAGS.patch b/sys-cluster/mpich2/files/mpich2-1.3-libtvmpich2.so-respect-user-LDFLAGS.patch
deleted file mode 100644
index 2a7ba2fb1..000000000
--- a/sys-cluster/mpich2/files/mpich2-1.3-libtvmpich2.so-respect-user-LDFLAGS.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e51d6ec114dafc10a7eeeeb04c1dfdc7a7b7514c Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Sat, 25 Sep 2010 12:04:35 -0400
-Subject: [PATCH] debugger: make libtvmpich2.so respect user LDFLAGS
-
----
- src/mpi/debugger/Makefile.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/mpi/debugger/Makefile.in b/src/mpi/debugger/Makefile.in
-index 834079f..8723e6f 100644
---- a/src/mpi/debugger/Makefile.in
-+++ b/src/mpi/debugger/Makefile.in
-@@ -172,7 +172,7 @@ SOURCEFILES = $(SOURCES)
- # There is no static debugger interface library
- # Force a custom target
- ./libtvmpich2.@SHLIB_EXT@: ./libtvmpich2.la
-- (cd . && $(CREATESHLIB) -libtype=@DBG_SHLIB_TYPE@ --mode=link -cc="@CC_SHL_DBG@" -clink="@C_LINK_SHL_DBG@" -o libtvmpich2.la -rpath $(libdir) )
-+ (cd . && $(CREATESHLIB) -libtype=@DBG_SHLIB_TYPE@ --mode=link -cc="@CC_SHL_DBG@" -clink="@C_LINK_SHL_DBG@" -o libtvmpich2.la -rpath $(libdir) -ldflags "$(LDFLAGS)" )
-
- #
- # We need to make sure that dbginit is compiled with -g, so
---
-1.7.2.2
-
diff --git a/sys-cluster/mpich2/files/mpich2-hvector.patch b/sys-cluster/mpich2/files/mpich2-hvector.patch
deleted file mode 100644
index 9d67561e3..000000000
--- a/sys-cluster/mpich2/files/mpich2-hvector.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/binding/f90/buildiface 2011-12-06 09:57:04.000000000 +0100
-+++ src/binding/f90/buildiface 2011-12-06 09:57:54.000000000 +0100
-@@ -117,9 +117,13 @@
- 'Type_hindexed-3' => 'int[]',
- 'Type_indexed-2' => 'int[]',
- 'Type_indexed-3' => 'int[]',
-+ 'Type_hvector-3' => 'int',
- 'Type_struct-2' => 'int[]',
- 'Type_struct-3' => 'int[]',
- 'Type_struct-4' => 'MPI_Datatype[]',
-+ 'Type_extent-2' => 'int',
-+ 'Type_lb-2' => 'int',
-+ 'Type_ub-2' => 'int',
- 'Waitall-2' => 'MPI_Request[]',
- 'Waitall-3' => 'MPI_Status[]',
- 'Waitany-2' => 'MPI_Request[]',
---- src/binding/f90/mpi_base.f90.in 2011-12-06 09:58:42.000000000 +0100
-+++ src/binding/f90/mpi_base.f90.in 2011-12-06 10:00:30.000000000 +0100
-@@ -15,9 +15,7 @@
- END SUBROUTINE MPI_COMM_FREE_KEYVAL
-
- SUBROUTINE MPI_TYPE_EXTENT(v0,v1,ierror)
-- USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND
-- INTEGER v0
-- INTEGER(KIND=MPI_ADDRESS_KIND) v1
-+ INTEGER v0, v1
- INTEGER ierror
- END SUBROUTINE MPI_TYPE_EXTENT
-
-@@ -114,9 +112,7 @@
- END SUBROUTINE MPI_OP_COMMUTATIVE
-
- SUBROUTINE MPI_TYPE_LB(v0,v1,ierror)
-- USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND
-- INTEGER v0
-- INTEGER(KIND=MPI_ADDRESS_KIND) v1
-+ INTEGER v0, v1
- INTEGER ierror
- END SUBROUTINE MPI_TYPE_LB
-
-@@ -562,9 +558,7 @@
- END SUBROUTINE MPI_TYPE_CREATE_RESIZED
-
- SUBROUTINE MPI_TYPE_UB(v0,v1,ierror)
-- USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND
-- INTEGER v0
-- INTEGER(KIND=MPI_ADDRESS_KIND) v1
-+ INTEGER v0, v1
- INTEGER ierror
- END SUBROUTINE MPI_TYPE_UB
-
-@@ -822,10 +816,7 @@
- END SUBROUTINE MPI_GET_VERSION
-
- SUBROUTINE MPI_TYPE_HVECTOR(v0,v1,v2,v3,v4,ierror)
-- USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND
-- INTEGER v0, v1
-- INTEGER(KIND=MPI_ADDRESS_KIND) v2
-- INTEGER v3, v4
-+ INTEGER v0, v1, v2, v3, v4
- INTEGER ierror
- END SUBROUTINE MPI_TYPE_HVECTOR
-
diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml
deleted file mode 100644
index 6cbe440fa..000000000
--- a/sys-cluster/mpich2/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>jsbronder@gentoo.org</email>
- <name>Justin Bronder</name>
- </maintainer>
- <maintainer type="person">
- <email>balaji@mcs.anl.gov</email>
- <name>Pavan Balaji</name>
- <description>Upstream Contact</description>
- </maintainer>
- <maintainer type="project">
- <email>cluster@gentoo.org</email>
- <name>Gentoo Cluster Project</name>
- </maintainer>
- <use>
- <flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
- <flag name="romio">Build the ROMIO MPI-IO component</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-cluster/mpich2/mpich2-1.5.ebuild b/sys-cluster/mpich2/mpich2-1.5.ebuild
deleted file mode 100644
index 29288ffcc..000000000
--- a/sys-cluster/mpich2/mpich2-1.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 mpi
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
-SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cxx doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="
- dev-libs/libaio
- sys-apps/hwloc
- romio? ( net-fs/nfs-utils )
- $(mpi_imp_deplist)"
-
-DEPEND="${COMMON_DEPEND}
- dev-lang/perl
- sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_setup() {
- FORTRAN_STANDARD="77 90"
- fortran-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.mpich2"
-
- if use mpi-threads && ! use threads; then
- ewarn "mpi-threads requires threads, assuming that's what you want"
- fi
-
- if mpi_classed; then
- MPD_CONF_FILE_DIR=/etc/$(mpi_class)
- else
- MPD_CONF_FILE_DIR=/etc/${PN}
- fi
-
-}
-
-src_prepare() {
- # Using MPICH2LIB_LDFLAGS doesn't seem to full work.
- sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
- src/packaging/pkgconfig/mpich2.pc.in \
- src/env/*.in \
- || die
-}
-
-src_configure() {
- local c="--enable-shared"
-
- # The configure statements can be somewhat confusing, as they
- # don't all show up in the top level configure, however, they
- # are picked up in the children directories.
-
- if use mpi-threads; then
- # MPI-THREAD requries threading.
- c="${c} --with-thread-package=pthreads"
- c="${c} --enable-threads=runtime"
- else
- if use threads ; then
- c="${c} --with-thread-package=pthreads"
- else
- c="${c} --with-thread-package=none"
- fi
- c="${c} --enable-threads=single"
- fi
-
- if ! mpi_classed; then
- c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
- c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
- else
- c="${c} --docdir=$(mpi_root)/usr/share/doc/${PF}"
- fi
-
- export MPICH2LIB_CFLAGS=${CFLAGS}
- export MPICH2LIB_CPPFLAGS=${CPPFLAGS}
- export MPICH2LIB_CXXFLAGS=${CXXFLAGS}
- export MPICH2LIB_FFLAGS=${FFLAGS}
- export MPICH2LIB_FCFLAGS=${FCFLAGS}
- export MPICH2LIB_LDFLAGS=${LDFLAGS}
- unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
-
- econf $(mpi_econf_args) ${c} \
- --with-pm=hydra \
- --disable-mpe \
- --disable-fast \
- --enable-smpcoll \
- --enable-versioning \
- $(use_enable romio) \
- $(use_enable cxx) \
- $(use_enable fortran f77) \
- $(use_enable fortran fc)
-}
-
-src_test() {
- emake -j1 check
-}
-
-src_install() {
- local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
-
- default
-
- mpi_dodir /usr/share/doc/${PF}
- mpi_dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES
- mpi_newdoc src/pm/hydra/README README.hydra
- if use romio; then
- mpi_newdoc src/mpi/romio/README README.romio
- fi
-
- if ! use doc; then
- rm -rf "${d}"usr/share/doc/${PF}/www*
- fi
-
- mpi_imp_add_eselect
-}
diff --git a/sys-cluster/mvapich2/files/eselect.mpi.mvapich2 b/sys-cluster/mvapich2/files/eselect.mpi.mvapich2
deleted file mode 100644
index d1d2131a1..000000000
--- a/sys-cluster/mvapich2/files/eselect.mpi.mvapich2
+++ /dev/null
@@ -1,8 +0,0 @@
-MPI_CC=@ROOT@/usr/bin/mpicc
-MPI_CXX=@ROOT@/usr/bin/mpic++
-MPI_F77=@ROOT@/usr/bin/mpif77
-MPI_F90=@ROOT@/usr/bin/mpif90
-MPI_BUILT_WITH=@BUILT_WITH@
-PATH=@ROOT@/usr/bin
-MANPATH=@ROOT@/usr/share/man
-LD_LIBRARY_PATH=@ROOT@/usr/@LIBDIR@
diff --git a/sys-cluster/mvapich2/metadata.xml b/sys-cluster/mvapich2/metadata.xml
deleted file mode 100644
index 50e4975c9..000000000
--- a/sys-cluster/mvapich2/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cluster@gentoo.org</email>
- <name>Gentoo Cluster Project</name>
- </maintainer>
- <longdescription>
-MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB.
-</longdescription>
- <use>
- <flag name="large-cluster">Automatically generated description for large-cluster</flag>
- <flag name="medium-cluster">Automatically generated description for medium-cluster</flag>
- <flag name="romio">Automatically generated description for romio</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
deleted file mode 100644
index 8ed791509..000000000
--- a/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic fortran-2 mpi
-
-DESCRIPTION="MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB"
-HOMEPAGE="http://mvapich.cse.ohio-state.edu/"
-SRC_URI="${HOMEPAGE}/download/mvapich2/mvapich2-${PV/_/-}.tgz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug fortran large-cluster medium-cluster romio threads"
-
-RDEPEND="
- sys-fabric/libibverbs:=
- sys-fabric/libibumad:=
- sys-fabric/libibmad:=
- sys-fabric/librdmacm:=
- "
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/mvapich2-${PV/_/-}"
-
-pkg_setup() {
- fortran-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.mvapich2"
-
- if [ -z "${MVAPICH_HCA_TYPE}" ]; then
- elog "${PN} needs to know which HCA it should optimize for. This is"
- elog "passed to the ebuild with the variable, \${MVAPICH_HCA_TYPE}."
- elog "Please choose one of: _MLX_PCI_EX_SDR_, _MLX_PCI_EX_DDR_,"
- elog "_MLX_PCI_X, _PATH_HT_, or _IBM_EHCA_."
- elog "See make.mvapich2.detect in ${S} for more information."
- die "MVAPICH_HCA_TYPE undefined"
- fi
-
- case ${ARCH} in
- amd64)
- if grep Intel /proc/cpuinfo &>/dev/null; then
- BUILD_ARCH=-D_EM64T_
- else
- BUILD_ARCH=-D_X86_64_
- fi
- ;;
- x86)
- BUILD_ARCH=-D_IA32_
- ;;
- ia64)
- BUILD_ARCH=-D_IA64_
- ;;
- ppc64)
- BUILD_ARCH=-D_PPC64_
- ;;
- *)
- die "unsupported architecture: ${ARCH}"
- ;;
- esac
-}
-
-src_prepare() {
- einfo "Disabling examples"
- # Examples are always compiled with the default 'all' target. This
- # causes problems when we don't build support for everything, including
- # threads, mpe2, etc. So we're not going to build them.
- sed -i 's:.*cd examples && ${MAKE} all.*::' Makefile.in || die
-}
-
-src_configure() {
- local c="--with-device=osu_ch3:mrail
- --with-rdma=gen2
- --with-pm=mpd
- $(use_enable romio)
- --with-mpe=no"
-
- # TODO Shared libs should build with this, but they don't
- # --enable-shared=gcc"
-
- local enable_srq
- local vcluster=-D_SMALL_CLUSTER
-
- use large-cluster && vcluster=-D_LARGE_CLUSTER
- use medium-cluster && vcluster=-D_MEDIUM_CLUSTER
- [ "${MVAPICH_HCA_TYPE}" == "_MLX_PCI_X_" ] && enable_srq="-DSRQ"
-
- append-ldflags "-lrdmacm"
- append-flags "-DADAPTIVE_RDMA_FAST_PATH -DRDMA_CM"
- append-ldflags "-libverbs -libumad -libmad"
-
- append-flags "${BUILD_ARCH} -DUSE_INLINE -D_SMP_ -D_GNU_SOURCE"
- append-flags "${enable_srq} -DUSE_HEADER_CACHING -DLAZY_MEM_UNREGISTER"
- append-flags "-DONE_SIDED -D${MVAPICH_HCA_TYPE} ${vcluster}"
- append-flags "-DMPID_USE_SEQUENCE_NUMBERS -DUSE_MPD_RING"
-
- use debug && c="${c} --enable-g=all --enable-debuginfo"
-
- if use threads; then
- c="${c} --enable-threads=multiple --with-thread-package=pthreads"
- append-flags "-pthread"
- else
- c="${c} --with-thread-package=none"
- fi
-
- # enable f90 support for appropriate compilers
- if use fortran; then
- case "$(tc-getFC)" in
- gfortran|ifort|f95)
- c="${c} --enable-f77 --enable-f90";;
- g77|f77|f2c)
- c="${c} --enable-f77 --disable-f90";;
- esac
- else
- c="${c} --disable-f77 --disable-f90"
- fi
-
- sed -i \
- -e 's/ ${exec_prefix}/ ${DESTDIR}${exec_prefix}/' \
- -e 's/ ${libdir}/ ${DESTDIR}${libdir}/' \
- ${S/-beta2/}/Makefile.in || die
- sed -i '/bindir/s/ ${bindir}/ ${DESTDIR}${bindir}/' ${S/-beta2/}/src/pm/mpd/Makefile.in || die
- cd ${S/-beta2/} || die
-
- ! mpi_classed && c="${c} --sysconfdir=/etc/${PN}"
- econf $(mpi_econf_args) ${c}
-}
-
-src_install() {
- emake DESTDIR="${D}"
- mpi_dodoc CHANGES_MPICH2 COPYRIGHT COPYRIGHT_MVAPICH2 LICENSE.TXT \
- README* RELEASE_NOTES*
- mpi_imp_add_eselect
-}
-
-pkg_postinst() {
- einfo "To allow normal users to use infiniband, it is necessary to"
- einfo "increase the system limits on locked memory."
- einfo "You must increase the kernel.shmmax sysctl value, and increase"
- einfo "the memlock limits in /etc/security/limits.conf. i.e.:"
- echo
- einfo "echo 'kernel.shmmax = 512000000' >> /etc/sysctl.conf"
- einfo "echo 512000000 > /proc/sys/kernel/shmmax"
- einfo "echo -e '* soft memlock 500000\n* hard memlock 500000' > /etc/security/limits.conf"
-}
diff --git a/sys-cluster/openmpi/files/eselect.mpi.openmpi b/sys-cluster/openmpi/files/eselect.mpi.openmpi
deleted file mode 100644
index c1a9373f3..000000000
--- a/sys-cluster/openmpi/files/eselect.mpi.openmpi
+++ /dev/null
@@ -1,8 +0,0 @@
-MPI_CC=@ROOT@usr/bin/mpicc
-MPI_CXX=@ROOT@usr/bin/mpic++
-MPI_F77=@ROOT@usr/bin/mpif77
-MPI_FC=@ROOT@usr/bin/mpif90
-CLASS_BASE_MPI_IMP=@BASE_IMP@
-PATH=@ROOT@usr/bin
-MANPATH=@ROOT@usr/share/man
-LD_LIBRARY_PATH=@ROOT@usr/@LIBDIR@
diff --git a/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch b/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
deleted file mode 100644
index 197430aee..000000000
--- a/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3bd5897c7ca8ab61fb024957aeae891e204b3e3f Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Mon, 1 Jul 2013 20:37:17 -0400
-Subject: [PATCH] hooks: disable malloc override inside of Gentoo sandbox
-
-As described in the comments in the source, Gentoo's own version of
-fakeroot, sandbox, also runs into hangs when malloc is overridden.
-Sandbox environments can easily be detected by looking for SANDBOX_PID
-in the environment. When detected, employ the same fix used for
-fakeroot.
-
-See https://bugs.gentoo.org/show_bug.cgi?id=462602
----
- opal/mca/memory/linux/hooks.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/opal/mca/memory/linux/hooks.c b/opal/mca/memory/linux/hooks.c
-index 6a1646f..5ded08c 100644
---- a/opal/mca/memory/linux/hooks.c
-+++ b/opal/mca/memory/linux/hooks.c
-@@ -747,9 +747,16 @@ static void opal_memory_linux_malloc_init_hook(void)
- "fakeroot" build environment that allocates memory during
- stat() (see http://bugs.debian.org/531522). It may not be
- necessary any more since we're using access(), not stat(). But
-- we'll leave the check, anyway. */
-+ we'll leave the check, anyway.
-+
-+ This is also an issue when using Gentoo's version of 'fakeroot',
-+ sandbox v2.5. Sandbox environments can also be detected fairly
-+ easily by looking for SANDBOX_ON.
-+ */
-+
- if (getenv("FAKEROOTKEY") != NULL ||
-- getenv("FAKED_MODE") != NULL) {
-+ getenv("FAKED_MODE") != NULL ||
-+ getenv("SANDBOX_ON") != NULL ) {
- return;
- }
-
---
-1.8.1.5
-
diff --git a/sys-cluster/openmpi/files/openmpi-ltdl.patch b/sys-cluster/openmpi/files/openmpi-ltdl.patch
deleted file mode 100644
index a288ea272..000000000
--- a/sys-cluster/openmpi/files/openmpi-ltdl.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -up openmpi-1.6.3/ompi/debuggers/dlopen_test.c.ltdl openmpi-1.6.3/ompi/debuggers/dlopen_test.c
---- openmpi-1.6.3/ompi/debuggers/dlopen_test.c.ltdl 2012-04-03 08:30:25.000000000 -0600
-+++ openmpi-1.6.3/ompi/debuggers/dlopen_test.c 2012-11-02 14:50:12.613702426 -0600
-@@ -13,7 +13,17 @@
- #include <string.h>
- #include <stdlib.h>
-
--#include "opal/libltdl/ltdl.h"
-+#if OPAL_WANT_LIBLTDL
-+ #ifndef __WINDOWS__
-+ #if OPAL_LIBLTDL_INTERNAL
-+ #include "opal/libltdl/ltdl.h"
-+ #else
-+ #include "ltdl.h"
-+ #endif
-+ #else
-+ #include "ltdl.h"
-+ #endif
-+#endif
-
- static int do_test(void);
-
-diff -up openmpi-1.6.3/ompi/debuggers/Makefile.am.ltdl openmpi-1.6.3/ompi/debuggers/Makefile.am
---- openmpi-1.6.3/ompi/debuggers/Makefile.am.ltdl 2012-04-03 08:30:25.000000000 -0600
-+++ openmpi-1.6.3/ompi/debuggers/Makefile.am 2012-11-02 15:04:53.636926260 -0600
-@@ -47,7 +47,7 @@ headers = \
-
- dlopen_test_SOURCES = dlopen_test.c
- dlopen_test_CPPFLAGS = -I$(top_srcdir)/opal/libltdl
--dlopen_test_LDADD = $(top_builddir)/opal/libltdl/libltdlc.la
-+dlopen_test_LDADD = $(LIBLTDL)
-
- predefined_gap_test_SOURCES = predefined_gap_test.c
- predefined_gap_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
-diff -up openmpi-1.6.3/test/support/components.c.ltdl openmpi-1.6.3/test/support/components.c
---- openmpi-1.6.3/test/support/components.c.ltdl 2012-04-03 08:29:44.000000000 -0600
-+++ openmpi-1.6.3/test/support/components.c 2012-11-02 14:50:29.204705380 -0600
-@@ -24,7 +24,17 @@
-
- #include "opal/constants.h"
- #include "opal/mca/mca.h"
--#include "opal/libltdl/ltdl.h"
-+#if OPAL_WANT_LIBLTDL
-+ #ifndef __WINDOWS__
-+ #if OPAL_LIBLTDL_INTERNAL
-+ #include "opal/libltdl/ltdl.h"
-+ #else
-+ #include "ltdl.h"
-+ #endif
-+ #else
-+ #include "ltdl.h"
-+ #endif
-+#endif
-
- #include "components.h"
-
-diff -up openmpi-1.6.3/test/support/components.h.ltdl openmpi-1.6.3/test/support/components.h
---- openmpi-1.6.3/test/support/components.h.ltdl 2012-04-03 08:29:44.000000000 -0600
-+++ openmpi-1.6.3/test/support/components.h 2012-11-02 14:50:22.409703519 -0600
-@@ -20,7 +20,17 @@
- #ifndef OMPI_SUPPORT_COMPONENTS_H
- #define OMPI_SUPPORT_COMPONENTS_H
-
--#include "opal/libltdl/ltdl.h"
-+#if OPAL_WANT_LIBLTDL
-+ #ifndef __WINDOWS__
-+ #if OPAL_LIBLTDL_INTERNAL
-+ #include "opal/libltdl/ltdl.h"
-+ #else
-+ #include "ltdl.h"
-+ #endif
-+ #else
-+ #include "ltdl.h"
-+ #endif
-+#endif
- #include "opal/mca/mca.h"
-
- BEGIN_C_DECLS
diff --git a/sys-cluster/openmpi/files/openmpi-r24328.patch b/sys-cluster/openmpi/files/openmpi-r24328.patch
deleted file mode 100644
index bbd689d3a..000000000
--- a/sys-cluster/openmpi/files/openmpi-r24328.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From cf054cd92dfac55f3920e805d01c11dcfc2cd4fa Mon Sep 17 00:00:00 2001
-From: jsquyres <jsquyres@cisco.com>
-Date: Mon, 28 Mar 2011 12:44:06 -0400
-Subject: [PATCH] Fix some fairly-important typos (!)
-
-Upstream commit r24328.
----
- test/datatype/ddt_lib.c | 2 +-
- test/datatype/ddt_raw.c | 2 +-
- test/datatype/opal_ddt_lib.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/datatype/ddt_lib.c b/test/datatype/ddt_lib.c
-index 015419d..c349384 100644
---- a/test/datatype/ddt_lib.c
-+++ b/test/datatype/ddt_lib.c
-@@ -209,7 +209,7 @@ int mpich_typeub2( void )
-
- int mpich_typeub3( void )
- {
-- int blocklen[2], err = 0, idisp[3];
-+ int blocklen[3], err = 0, idisp[3];
- size_t sz;
- MPI_Aint disp[3], lb, ub, ex;
- ompi_datatype_t *types[3], *dt1, *dt2, *dt3, *dt4, *dt5;
-diff --git a/test/datatype/ddt_raw.c b/test/datatype/ddt_raw.c
-index eea9004..7effe65 100644
---- a/test/datatype/ddt_raw.c
-+++ b/test/datatype/ddt_raw.c
-@@ -45,7 +45,7 @@ static int test_upper( unsigned int length )
- {
- ompi_datatype_t *pdt;
- opal_convertor_t * pConv;
-- int rc;
-+ int rc = OMPI_SUCCESS;
- unsigned int i, iov_count, split_chunk, total_length;
- size_t max_data;
- struct iovec iov[5];
-diff --git a/test/datatype/opal_ddt_lib.c b/test/datatype/opal_ddt_lib.c
-index e05bb06..dffd86c 100644
---- a/test/datatype/opal_ddt_lib.c
-+++ b/test/datatype/opal_ddt_lib.c
-@@ -759,7 +759,7 @@ int mpich_typeub2( void )
-
- int mpich_typeub3( void )
- {
-- int blocklen[2], err = 0, idisp[3];
-+ int blocklen[3], err = 0, idisp[3];
- size_t sz;
- OPAL_PTRDIFF_TYPE disp[3], lb, ub, ex;
- opal_datatype_t *types[3], *dt1, *dt2, *dt3, *dt4, *dt5;
---
-1.7.3.4
-
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
deleted file mode 100644
index 08b693bf5..000000000
--- a/sys-cluster/openmpi/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>jsbronder@gentoo.org</email>
- </maintainer>
- <maintainer type="project">
- <email>cluster@gentoo.org</email>
- <name>Gentoo Cluster Project</name>
- </maintainer>
- <use>
- <flag name="cma">Enable the CMA (Cross Memory Attach) MCA</flag>
- <flag name="cuda">Add GPU direct support</flag>
- <flag name="heterogeneous">Enable features required for heterogeneous
-platform support</flag>
- <flag name="romio">Build the ROMIO MPI-IO component</flag>
- <flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
- <flag name="numa">Enable numactl to allow binding processes to CPUs</flag>
- <flag name="vt">Enable bundled VampirTrace support</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
deleted file mode 100644
index de982dc42..000000000
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal mpi
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
- openmpi_fabrics_ofed
- openmpi_fabrics_knem
- openmpi_fabrics_psm"
-
-IUSE_OPENMPI_RM="
- openmpi_rm_pbs
- openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
- openmpi_ofed_features_control-hdr-padding
- openmpi_ofed_features_connectx-xrc
- openmpi_ofed_features_udcm
- openmpi_ofed_features_rdmacm
- openmpi_ofed_features_dynamic-sl
- openmpi_ofed_features_failover"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads vt
- ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
- openmpi_rm_pbs? ( !openmpi_rm_slurm )
- openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
-
-MPI_UNCLASSED_DEP_STR="
- !sys-cluster/pmix
- vt? (
- !dev-libs/libotf
- !app-text/lcdf-typetools
- )"
-
-CDEPEND="
- >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}]
- dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )
- openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
- openmpi_fabrics_knem? ( sys-cluster/knem )
- openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
- openmpi_rm_pbs? ( sys-cluster/torque )
- openmpi_rm_slurm? ( sys-cluster/slurm )
- openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )
- $(mpi_imp_deplist)"
-
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/mpi.h
- /usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
- fortran-2_pkg_setup
- java-pkg-opt-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.openmpi"
-
- if use mpi-threads; then
- ewarn
- ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
- ewarn "default and officially unsupported by upstream."
- ewarn "You may stop now and set USE=-mpi-threads"
- ewarn
- fi
-
- elog
- elog "OpenMPI has an overwhelming count of configuration options."
- elog "Don't forget the EXTRA_ECONF environment variable can let you"
- elog "specify configure options if you find them necessary."
- elog
-}
-
-src_prepare() {
- default
-
- # Necessary for scalibility, see
- # http://www.open-mpi.org/community/lists/users/2008/09/6514.php
- if use threads; then
- echo 'oob_tcp_listen_mode = listen_thread' \
- >> opal/etc/openmpi-mca-params.conf || die
- fi
-}
-
-multilib_src_configure() {
- if use java; then
- # We must always build with the right -source and -target
- # flags. Passing flags to javac isn't explicitly supported here
- # but we can cheat by overriding the configure test for javac.
- export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
- fi
-
- ECONF_SOURCE=${S} econf $(mpi_econf_args) \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- --enable-pretty-print-stacktrace \
- --enable-orterun-prefix-by-default \
- --with-hwloc="${EPREFIX}/usr" \
- --with-libltdl="${EPREFIX}/usr" \
- --enable-mpi-fortran=$(usex fortran all no) \
- $(usex !vt --enable-contrib-no-build=vt "") \
- $(use_enable cxx mpi-cxx) \
- $(use_with cma) \
- $(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
- $(use_enable romio io-romio) \
- $(use_enable heterogeneous) \
- $(use_enable ipv6) \
- $(multilib_native_use_enable java) \
- $(multilib_native_use_enable java mpi-java) \
- $(multilib_native_use_enable mpi-threads mpi-thread-multiple) \
- $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
- $(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
- $(multilib_native_use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
- $(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
- $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
- $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
- $(multilib_native_use_enable openmpi_ofed_features_failover btl-openib-failover) \
- $(multilib_native_use_with openmpi_rm_pbs tm) \
- $(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
- # Doesn't work with the default src_test as the dry run (-n) fails.
- emake -j1 check
-}
-
-multilib_src_install() {
- default
-
- # fortran header cannot be wrapped (bug #540508), workaround part 1
- if multilib_is_native_abi && use fortran; then
- mkdir "${T}"/fortran || die
- mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die
- else
- # some fortran files get installed unconditionally
- rm "${ED}"/$(mpi_root)/usr/include/mpif* "${ED}"usr/bin/mpif* || die
- fi
-}
-
-multilib_src_install_all() {
- # From USE=vt see #359917
- rm -rf "${ED}"/$(mpi_root)/usr/share/libtool &> /dev/null
-
- # fortran header cannot be wrapped (bug #540508), workaround part 2
- if use fortran; then
- mv "${T}"/fortran/mpif* "${ED}"/$(mpi_root)/usr/include || die
- fi
-
- # Avoid collisions with libevent
- rm -rf "${ED}"/$(mpi_root)/usr/include/event2 &> /dev/null || die
-
- # Remove la files, no static libs are installed and we have pkg-config
- find "${ED}" -name '*.la' -delete || die
-
- if use java; then
- local mpi_jar="${ED}"/$(mpi_root)/usr/$(get_libdir)/mpi.jar
- java-pkg_dojar "${mpi_jar}"
- # We don't want to install the jar file twice
- # so let's clean after ourselves.
- rm "${mpi_jar}" || die
- fi
-
- mpi_dodoc README AUTHORS NEWS VERSION
- mpi_imp_add_eselect
-}
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
deleted file mode 100644
index b7fa7fabd..000000000
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda eutils flag-o-matic fortran-2 java-pkg-opt-2 multilib mpi toolchain-funcs versionator
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
- openmpi_fabrics_ofed
- openmpi_fabrics_knem
- openmpi_fabrics_open-mx
- openmpi_fabrics_psm"
-
-IUSE_OPENMPI_RM="
- openmpi_rm_pbs
- openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
- openmpi_ofed_features_control-hdr-padding
- openmpi_ofed_features_connectx-xrc
- openmpi_ofed_features_udcm
- openmpi_ofed_features_rdmacm
- openmpi_ofed_features_dynamic-sl
- openmpi_ofed_features_failover"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads vt
- ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
- openmpi_rm_pbs? ( !openmpi_rm_slurm )
- openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
-
-MPI_UNCLASSED_DEP_STR="
- !sys-cluster/pmix
- vt? (
- !dev-libs/libotf
- !app-text/lcdf-typetools
- )"
-
-RDEPEND="
- dev-libs/libevent
- dev-libs/libltdl:0
- <sys-apps/hwloc-2[numa?]
- sys-libs/zlib
- cuda? ( dev-util/nvidia-cuda-toolkit )
- elibc_FreeBSD? ( dev-libs/libexecinfo )
- java? ( >=virtual/jre-1.6:* )
- openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
- openmpi_fabrics_knem? ( sys-cluster/knem )
- openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
- openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
- openmpi_rm_pbs? ( sys-cluster/torque )
- openmpi_rm_slurm? ( sys-cluster/slurm )
- openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )
- $(mpi_imp_deplist)"
-DEPEND="${RDEPEND}
- java? ( >=virtual/jdk-1.6 )"
-
-pkg_setup() {
- fortran-2_pkg_setup
- java-pkg-opt-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.openmpi"
-
- if use mpi-threads; then
- echo
- ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
- ewarn "default and officially unsupported by upstream."
- ewarn "You may stop now and set USE=-mpi-threads"
- echo
- fi
-
- echo
- elog "OpenMPI has an overwhelming count of configuration options."
- elog "Don't forget the EXTRA_ECONF environment variable can let you"
- elog "specify configure options if you find them necessary."
- echo
-}
-
-src_prepare() {
- # Necessary for scalibility, see
- # http://www.open-mpi.org/community/lists/users/2008/09/6514.php
- if use threads; then
- echo 'oob_tcp_listen_mode = listen_thread' \
- >> opal/etc/openmpi-mca-params.conf
- fi
-}
-
-src_configure() {
- local myconf=(
- --sysconfdir="${EPREFIX}/etc/${PN}"
- --enable-pretty-print-stacktrace
- --enable-orterun-prefix-by-default
- --with-hwloc="${EPREFIX}/usr"
- --with-libltdl="${EPREFIX}/usr"
- )
-
- if use fortran; then
- myconf+=(--enable-mpi-fortran=all)
- else
- myconf+=(--enable-mpi-fortran=no)
- fi
-
- if use java; then
- # We must always build with the right -source and -target
- # flags. Passing flags to javac isn't explicitly supported here
- # but we can cheat by overriding the configure test for javac.
- export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
- fi
-
- ! use vt && myconf+=(--enable-contrib-no-build=vt)
-
- econf $(mpi_econf_args) "${myconf[@]}" \
- $(use_enable cxx mpi-cxx) \
- $(use_with cma) \
- $(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
- $(use_enable romio io-romio) \
- $(use_enable heterogeneous) \
- $(use_enable ipv6) \
- $(use_enable java) \
- $(use_enable java mpi-java) \
- $(use_enable mpi-threads mpi-thread-multiple) \
- $(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
- $(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
- $(use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \
- $(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
- $(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
- $(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
- $(use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
- $(use_enable openmpi_ofed_features_udcm openib-udcm) \
- $(use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
- $(use_enable openmpi_ofed_features_failover btl-openib-failover) \
- $(use_with openmpi_rm_pbs tm) \
- $(use_with openmpi_rm_slurm slurm)
-}
-
-src_install () {
- default
-
- # From USE=vt see #359917
- rm "${ED}"/$(mpi_root)/usr/share/libtool &> /dev/null
-
- # Avoid collisions with libevent
- rm -rf "${ED}"/$(mpi_root)/usr/include/event2 &> /dev/null
-
- # Remove la files, no static libs are installed and we have pkg-config
- find "${ED}"/$(mpi_root)/usr/$(get_libdir)/ -type f -name '*.la' -delete
-
- if use java; then
- local mpi_jar="${ED}"/$(mpi_root)/usr/$(get_libdir)/mpi.jar
- java-pkg_dojar "${mpi_jar}"
- # We don't want to install the jar file twice
- # so let's clean after ourselves.
- rm "${mpi_jar}" || die
- fi
-
- mpi_dodoc README AUTHORS NEWS VERSION
- mpi_imp_add_eselect
-}
-
-src_test() {
- # Doesn't work with the default src_test as the dry run (-n) fails.
- emake -j1 check
-}
diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
deleted file mode 100644
index bfd34c9b0..000000000
--- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal mpi
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
- openmpi_fabrics_ofed
- openmpi_fabrics_knem
- openmpi_fabrics_psm"
-
-IUSE_OPENMPI_RM="
- openmpi_rm_pbs
- openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
- openmpi_ofed_features_control-hdr-padding
- openmpi_ofed_features_connectx-xrc
- openmpi_ofed_features_udcm
- openmpi_ofed_features_rdmacm
- openmpi_ofed_features_dynamic-sl
- openmpi_ofed_features_failover"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads
- ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
- openmpi_rm_pbs? ( !openmpi_rm_slurm )
- openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
-
-MPI_UNCLASSED_DEP_STR="
- !sys-cluster/pmix
-"
-
-CDEPEND="
- >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
- dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )
- openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
- openmpi_fabrics_knem? ( sys-cluster/knem )
- openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
- openmpi_rm_pbs? ( sys-cluster/torque )
- openmpi_rm_slurm? ( sys-cluster/slurm )
- openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )
- $(mpi_imp_deplist)"
-
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/mpi.h
- /usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
- fortran-2_pkg_setup
- java-pkg-opt-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.openmpi"
-
- elog
- elog "OpenMPI has an overwhelming count of configuration options."
- elog "Don't forget the EXTRA_ECONF environment variable can let you"
- elog "specify configure options if you find them necessary."
- elog
-}
-
-src_prepare() {
- default
-
- # Necessary for scalibility, see
- # http://www.open-mpi.org/community/lists/users/2008/09/6514.php
- if use threads; then
- echo 'oob_tcp_listen_mode = listen_thread' \
- >> opal/etc/openmpi-mca-params.conf || die
- fi
-}
-
-multilib_src_configure() {
- if use java; then
- # We must always build with the right -source and -target
- # flags. Passing flags to javac isn't explicitly supported here
- # but we can cheat by overriding the configure test for javac.
- export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
- fi
-
- ECONF_SOURCE=${S} econf $(mpi_econf_args) \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- --enable-pretty-print-stacktrace \
- --enable-orterun-prefix-by-default \
- --with-hwloc="${EPREFIX}/usr" \
- --with-libltdl="${EPREFIX}/usr" \
- --with-libevent="${EPREFIX}/usr" \
- --enable-mpi-fortran=$(usex fortran all no) \
- $(use_enable cxx mpi-cxx) \
- $(use_with cma) \
- $(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
- $(use_enable romio io-romio) \
- $(use_enable heterogeneous) \
- $(use_enable ipv6) \
- $(multilib_native_use_enable java) \
- $(multilib_native_use_enable java mpi-java) \
- $(multilib_native_use_enable mpi-threads mpi-thread-multiple) \
- $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
- $(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
- $(multilib_native_use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
- $(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
- $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
- $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
- $(multilib_native_use_enable openmpi_ofed_features_failover btl-openib-failover) \
- $(multilib_native_use_with openmpi_rm_pbs tm) \
- $(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
- # Doesn't work with the default src_test as the dry run (-n) fails.
- emake -j1 check
-}
-
-multilib_src_install() {
- default
-
- # fortran header cannot be wrapped (bug #540508), workaround part 1
- if multilib_is_native_abi && use fortran; then
- mkdir "${T}"/fortran || die
- mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die
- else
- # some fortran files get installed unconditionally
- rm "${ED}"/$(mpi_root)/usr/include/mpif* "${ED}"usr/bin/mpif* || die
- fi
-}
-
-multilib_src_install_all() {
- # fortran header cannot be wrapped (bug #540508), workaround part 2
- if use fortran; then
- mv "${T}"/fortran/mpif* "${ED}"/$(mpi_root)/usr/include || die
- fi
-
- # Remove la files, no static libs are installed and we have pkg-config
- find "${ED}" -name '*.la' -delete || die
-
- if use java; then
- local mpi_jar="${ED}"/$(mpi_root)/usr/$(get_libdir)/mpi.jar
- java-pkg_dojar "${mpi_jar}"
- # We don't want to install the jar file twice
- # so let's clean after ourselves.
- rm "${mpi_jar}" || die
- fi
-
- mpi_dodoc README AUTHORS NEWS VERSION
- mpi_imp_add_eselect
-}
diff --git a/sys-cluster/openmpi/openmpi-2.1.6.ebuild b/sys-cluster/openmpi/openmpi-2.1.6.ebuild
deleted file mode 100644
index f616b2844..000000000
--- a/sys-cluster/openmpi/openmpi-2.1.6.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal mpi
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
- openmpi_fabrics_ofed
- openmpi_fabrics_knem
- openmpi_fabrics_psm"
-
-IUSE_OPENMPI_RM="
- openmpi_rm_pbs
- openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
- openmpi_ofed_features_control-hdr-padding
- openmpi_ofed_features_udcm
- openmpi_ofed_features_rdmacm
- openmpi_ofed_features_dynamic-sl"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads
- ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
- openmpi_rm_pbs? ( !openmpi_rm_slurm )
- openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-MPI_UNCLASSED_DEP_STR="
- !sys-cluster/pmix
-"
-
-CDEPEND="
- >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
- dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )
- openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
- openmpi_fabrics_knem? ( sys-cluster/knem )
- openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
- openmpi_rm_pbs? ( sys-cluster/torque )
- openmpi_rm_slurm? ( sys-cluster/slurm )
- openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )
- $(mpi_imp_deplist)"
-
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/mpi.h
- /usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
- fortran-2_pkg_setup
- java-pkg-opt-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.openmpi"
-
- elog
- elog "OpenMPI has an overwhelming count of configuration options."
- elog "Don't forget the EXTRA_ECONF environment variable can let you"
- elog "specify configure options if you find them necessary."
- elog
-}
-
-src_prepare() {
- default
-
- # Necessary for scalibility, see
- # http://www.open-mpi.org/community/lists/users/2008/09/6514.php
- if use threads; then
- echo 'oob_tcp_listen_mode = listen_thread' \
- >> opal/etc/openmpi-mca-params.conf || die
- fi
-}
-
-multilib_src_configure() {
- if use java; then
- # We must always build with the right -source and -target
- # flags. Passing flags to javac isn't explicitly supported here
- # but we can cheat by overriding the configure test for javac.
- export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
- fi
-
- ECONF_SOURCE=${S} econf $(mpi_econf_args) \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- --enable-pretty-print-stacktrace \
- --enable-orterun-prefix-by-default \
- --with-hwloc="${EPREFIX}/usr" \
- --with-libltdl="${EPREFIX}/usr" \
- --with-libevent="${EPREFIX}/usr" \
- --enable-mpi-fortran=$(usex fortran all no) \
- $(use_enable cxx mpi-cxx) \
- $(use_with cma) \
- $(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
- $(use_enable romio io-romio) \
- $(use_enable heterogeneous) \
- $(use_enable ipv6) \
- $(multilib_native_use_enable java) \
- $(multilib_native_use_enable java mpi-java) \
- $(multilib_native_use_enable mpi-threads mpi-thread-multiple) \
- $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
- $(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
- $(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
- $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
- $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
- $(multilib_native_use_with openmpi_rm_pbs tm) \
- $(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
- # Doesn't work with the default src_test as the dry run (-n) fails.
- emake -j1 check
-}
-
-multilib_src_install() {
- default
-
- # fortran header cannot be wrapped (bug #540508), workaround part 1
- if multilib_is_native_abi && use fortran; then
- mkdir "${T}"/fortran || die
- mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die
- else
- # some fortran files get installed unconditionally
- rm \
- "${ED}"/$(mpi_root)/usr/include/mpif* \
- "${ED}"/$(mpi_root)/usr/bin/mpif* \
- "${ED}"/$(mpi_root)/usr/bin/oshfort \
- "${ED}"/$(mpi_root)/usr/bin/shmemfort \
- || die
- fi
-}
-
-multilib_src_install_all() {
- # fortran header cannot be wrapped (bug #540508), workaround part 2
- if use fortran; then
- mv "${T}"/fortran/mpif* "${ED}"/$(mpi_root)/usr/include || die
- fi
-
- # Remove la files, no static libs are installed and we have pkg-config
- find "${ED}" -name '*.la' -delete || die
-
- if use java; then
- local mpi_jar="${ED}"/$(mpi_root)/usr/$(get_libdir)/mpi.jar
- java-pkg_dojar "${mpi_jar}"
- # We don't want to install the jar file twice
- # so let's clean after ourselves.
- rm "${mpi_jar}" || die
- fi
-
- mpi_dodoc README AUTHORS NEWS VERSION
- mpi_imp_add_eselect
-}
diff --git a/sys-cluster/openmpi/openmpi-3.0.4.ebuild b/sys-cluster/openmpi/openmpi-3.0.4.ebuild
deleted file mode 100644
index bcb60baa5..000000000
--- a/sys-cluster/openmpi/openmpi-3.0.4.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal mpi
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
- openmpi_fabrics_ofed
- openmpi_fabrics_knem
- openmpi_fabrics_psm"
-
-IUSE_OPENMPI_RM="
- openmpi_rm_pbs
- openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
- openmpi_ofed_features_control-hdr-padding
- openmpi_ofed_features_udcm
- openmpi_ofed_features_rdmacm
- openmpi_ofed_features_dynamic-sl"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio
- ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
- openmpi_rm_pbs? ( !openmpi_rm_slurm )
- openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-MPI_UNCLASSED_DEP_STR="
- !sys-cluster/pmix
-"
-
-CDEPEND="
- >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
- dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )
- openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
- openmpi_fabrics_knem? ( sys-cluster/knem )
- openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
- openmpi_rm_pbs? ( sys-cluster/torque )
- openmpi_rm_slurm? ( sys-cluster/slurm )
- openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )
- $(mpi_imp_deplist)"
-
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/mpi.h
- /usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
- fortran-2_pkg_setup
- java-pkg-opt-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.openmpi"
-
- elog
- elog "OpenMPI has an overwhelming count of configuration options."
- elog "Don't forget the EXTRA_ECONF environment variable can let you"
- elog "specify configure options if you find them necessary."
- elog
-}
-
-src_prepare() {
- default
-
- # Necessary for scalibility, see
- # http://www.open-mpi.org/community/lists/users/2008/09/6514.php
- echo 'oob_tcp_listen_mode = listen_thread' \
- >> opal/etc/openmpi-mca-params.conf || die
-}
-
-multilib_src_configure() {
- if use java; then
- # We must always build with the right -source and -target
- # flags. Passing flags to javac isn't explicitly supported here
- # but we can cheat by overriding the configure test for javac.
- export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
- fi
-
- ECONF_SOURCE=${S} econf $(mpi_econf_args) \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- --enable-pretty-print-stacktrace \
- --enable-orterun-prefix-by-default \
- --with-hwloc="${EPREFIX}/usr" \
- --with-libltdl="${EPREFIX}/usr" \
- --with-libevent="${EPREFIX}/usr" \
- --enable-mpi-fortran=$(usex fortran all no) \
- $(use_enable cxx mpi-cxx) \
- $(use_with cma) \
- $(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
- $(use_enable romio io-romio) \
- $(use_enable heterogeneous) \
- $(use_enable ipv6) \
- $(multilib_native_use_enable java) \
- $(multilib_native_use_enable java mpi-java) \
- $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
- $(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
- $(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
- $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
- $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
- $(multilib_native_use_with openmpi_rm_pbs tm) \
- $(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
- # Doesn't work with the default src_test as the dry run (-n) fails.
- emake -j1 check
-}
-
-multilib_src_install() {
- default
-
- # fortran header cannot be wrapped (bug #540508), workaround part 1
- if multilib_is_native_abi && use fortran; then
- mkdir "${T}"/fortran || die
- mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die
- else
- # some fortran files get installed unconditionally
- rm \
- "${ED}"/$(mpi_root)/usr/include/mpif* \
- "${ED}"/$(mpi_root)/usr/bin/mpif* \
- "${ED}"/$(mpi_root)/usr/bin/oshfort \
- "${ED}"/$(mpi_root)/usr/bin/shmemfort \
- || die
- fi
-}
-
-multilib_src_install_all() {
- # fortran header cannot be wrapped (bug #540508), workaround part 2
- if use fortran; then
- mv "${T}"/fortran/mpif* "${ED}"/$(mpi_root)/usr/include || die
- fi
-
- # Remove la files, no static libs are installed and we have pkg-config
- find "${ED}" -name '*.la' -delete || die
-
- if use java; then
- local mpi_jar="${ED}"/$(mpi_root)/usr/$(get_libdir)/mpi.jar
- java-pkg_dojar "${mpi_jar}"
- # We don't want to install the jar file twice
- # so let's clean after ourselves.
- rm "${mpi_jar}" || die
- fi
-
- mpi_dodoc README AUTHORS NEWS VERSION
- mpi_imp_add_eselect
-}
diff --git a/sys-cluster/openmpi/openmpi-3.1.4.ebuild b/sys-cluster/openmpi/openmpi-3.1.4.ebuild
deleted file mode 100644
index bcb60baa5..000000000
--- a/sys-cluster/openmpi/openmpi-3.1.4.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal mpi
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
- openmpi_fabrics_ofed
- openmpi_fabrics_knem
- openmpi_fabrics_psm"
-
-IUSE_OPENMPI_RM="
- openmpi_rm_pbs
- openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
- openmpi_ofed_features_control-hdr-padding
- openmpi_ofed_features_udcm
- openmpi_ofed_features_rdmacm
- openmpi_ofed_features_dynamic-sl"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio
- ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
- openmpi_rm_pbs? ( !openmpi_rm_slurm )
- openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-MPI_UNCLASSED_DEP_STR="
- !sys-cluster/pmix
-"
-
-CDEPEND="
- >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
- dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )
- openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
- openmpi_fabrics_knem? ( sys-cluster/knem )
- openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
- openmpi_rm_pbs? ( sys-cluster/torque )
- openmpi_rm_slurm? ( sys-cluster/slurm )
- openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )
- $(mpi_imp_deplist)"
-
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/mpi.h
- /usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
- fortran-2_pkg_setup
- java-pkg-opt-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.openmpi"
-
- elog
- elog "OpenMPI has an overwhelming count of configuration options."
- elog "Don't forget the EXTRA_ECONF environment variable can let you"
- elog "specify configure options if you find them necessary."
- elog
-}
-
-src_prepare() {
- default
-
- # Necessary for scalibility, see
- # http://www.open-mpi.org/community/lists/users/2008/09/6514.php
- echo 'oob_tcp_listen_mode = listen_thread' \
- >> opal/etc/openmpi-mca-params.conf || die
-}
-
-multilib_src_configure() {
- if use java; then
- # We must always build with the right -source and -target
- # flags. Passing flags to javac isn't explicitly supported here
- # but we can cheat by overriding the configure test for javac.
- export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
- fi
-
- ECONF_SOURCE=${S} econf $(mpi_econf_args) \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- --enable-pretty-print-stacktrace \
- --enable-orterun-prefix-by-default \
- --with-hwloc="${EPREFIX}/usr" \
- --with-libltdl="${EPREFIX}/usr" \
- --with-libevent="${EPREFIX}/usr" \
- --enable-mpi-fortran=$(usex fortran all no) \
- $(use_enable cxx mpi-cxx) \
- $(use_with cma) \
- $(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
- $(use_enable romio io-romio) \
- $(use_enable heterogeneous) \
- $(use_enable ipv6) \
- $(multilib_native_use_enable java) \
- $(multilib_native_use_enable java mpi-java) \
- $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
- $(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
- $(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
- $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
- $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
- $(multilib_native_use_with openmpi_rm_pbs tm) \
- $(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
- # Doesn't work with the default src_test as the dry run (-n) fails.
- emake -j1 check
-}
-
-multilib_src_install() {
- default
-
- # fortran header cannot be wrapped (bug #540508), workaround part 1
- if multilib_is_native_abi && use fortran; then
- mkdir "${T}"/fortran || die
- mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die
- else
- # some fortran files get installed unconditionally
- rm \
- "${ED}"/$(mpi_root)/usr/include/mpif* \
- "${ED}"/$(mpi_root)/usr/bin/mpif* \
- "${ED}"/$(mpi_root)/usr/bin/oshfort \
- "${ED}"/$(mpi_root)/usr/bin/shmemfort \
- || die
- fi
-}
-
-multilib_src_install_all() {
- # fortran header cannot be wrapped (bug #540508), workaround part 2
- if use fortran; then
- mv "${T}"/fortran/mpif* "${ED}"/$(mpi_root)/usr/include || die
- fi
-
- # Remove la files, no static libs are installed and we have pkg-config
- find "${ED}" -name '*.la' -delete || die
-
- if use java; then
- local mpi_jar="${ED}"/$(mpi_root)/usr/$(get_libdir)/mpi.jar
- java-pkg_dojar "${mpi_jar}"
- # We don't want to install the jar file twice
- # so let's clean after ourselves.
- rm "${mpi_jar}" || die
- fi
-
- mpi_dodoc README AUTHORS NEWS VERSION
- mpi_imp_add_eselect
-}
diff --git a/sys-cluster/openmpi/openmpi-4.0.1-r2.ebuild b/sys-cluster/openmpi/openmpi-4.0.1-r2.ebuild
deleted file mode 100644
index 489306f51..000000000
--- a/sys-cluster/openmpi/openmpi-4.0.1-r2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda eapi7-ver flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal mpi
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
- openmpi_fabrics_ofed
- openmpi_fabrics_knem
- openmpi_fabrics_psm"
-
-IUSE_OPENMPI_RM="
- openmpi_rm_pbs
- openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
- openmpi_ofed_features_control-hdr-padding
- openmpi_ofed_features_udcm
- openmpi_ofed_features_rdmacm
- openmpi_ofed_features_dynamic-sl"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java romio
- ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
- openmpi_rm_pbs? ( !openmpi_rm_slurm )
- openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
- openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-MPI_UNCLASSED_DEP_STR="
- !sys-cluster/pmix
-"
-
-CDEPEND="
- >=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
- dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- >=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
- elibc_FreeBSD? ( dev-libs/libexecinfo )
- openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
- openmpi_fabrics_knem? ( sys-cluster/knem )
- openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
- openmpi_rm_pbs? ( sys-cluster/torque )
- openmpi_rm_slurm? ( sys-cluster/slurm )
- openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )
- $(mpi_imp_deplist)"
-
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/mpi.h
- /usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
- fortran-2_pkg_setup
- java-pkg-opt-2_pkg_setup
- MPI_ESELECT_FILE="eselect.mpi.openmpi"
-
- elog
- elog "OpenMPI has an overwhelming count of configuration options."
- elog "Don't forget the EXTRA_ECONF environment variable can let you"
- elog "specify configure options if you find them necessary."
- elog
-}
-
-src_prepare() {
- default
-
- # Necessary for scalibility, see
- # http://www.open-mpi.org/community/lists/users/2008/09/6514.php
- echo 'oob_tcp_listen_mode = listen_thread' \
- >> opal/etc/openmpi-mca-params.conf || die
-}
-
-multilib_src_configure() {
- if use java; then
- # We must always build with the right -source and -target
- # flags. Passing flags to javac isn't explicitly supported here
- # but we can cheat by overriding the configure test for javac.
- export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
- fi
-
- ECONF_SOURCE=${S} econf $(mpi_econf_args) \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- --enable-pretty-print-stacktrace \
- --enable-orterun-prefix-by-default \
- --with-hwloc="${EPREFIX}/usr" \
- --with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)" \
- --with-libltdl="${EPREFIX}/usr" \
- --with-libevent="${EPREFIX}/usr" \
- --with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)" \
- --enable-mpi-fortran=$(usex fortran all no) \
- $(use_enable cxx mpi-cxx) \
- $(use_with cma) \
- $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
- $(use_enable romio io-romio) \
- $(use_enable heterogeneous) \
- $(use_enable ipv6) \
- $(multilib_native_use_enable java mpi-java) \
- $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
- $(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
- $(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
- $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
- $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
- $(multilib_native_use_with openmpi_rm_pbs tm) \
- $(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
- # Doesn't work with the default src_test as the dry run (-n) fails.
- emake -j1 check
-}
-
-multilib_src_install() {
- default
-
- # fortran header cannot be wrapped (bug #540508), workaround part 1
- if multilib_is_native_abi && use fortran; then
- mkdir "${T}"/fortran || die
- mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die
- else
- # some fortran files get installed unconditionally
- rm \
- "${ED}"/$(mpi_root)/usr/include/mpif* \
- "${ED}"/$(mpi_root)/usr/bin/mpif* \
- || die
- fi
-}
-
-multilib_src_install_all() {
- # fortran header cannot be wrapped (bug #540508), workaround part 2
- if use fortran; then
- mv "${T}"/fortran/mpif* "${ED}"/$(mpi_root)/usr/include || die
- fi
-
- # Remove la files, no static libs are installed and we have pkg-config
- find "${ED}" -name '*.la' -delete || die
-
- if use java; then
- local mpi_jar="${ED}"/$(mpi_root)/usr/$(get_libdir)/mpi.jar
- java-pkg_dojar "${mpi_jar}"
- # We don't want to install the jar file twice
- # so let's clean after ourselves.
- rm "${mpi_jar}" || die
- fi
-
- mpi_dodoc README AUTHORS NEWS VERSION
- mpi_imp_add_eselect
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-09-27 15:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-27 15:32 [gentoo-commits] proj/sci:master commit in: sys-cluster/mvapich2/, sys-cluster/openmpi/, sys-cluster/mvapich2/files/, Aisha Tammy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox