Version bump for 1.4 and 1.6 series. Fix bug #462144

(Portage version: 2.2.0_alpha168/cvs/Linux x86_64, signed Manifest commit with key F82F92E6)

4 files changed, 271 insertions, 4 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 543f14138a10..041b9c3f8ccf 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.116 2013/01/10 00:33:16 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.117 2013/03/21 04:11:20 alexxy Exp $
+
+*openmpi-1.6.4 (21 Mar 2013)
+*openmpi-1.4.5 (21 Mar 2013)
+
+  21 Mar 2013; Alexey Shvetsov <alexxy@gentoo.org> +openmpi-1.4.5.ebuild,
+  +openmpi-1.6.4.ebuild, openmpi-1.4.3.ebuild:
+  Version bump for 1.4 and 1.6 series. Fix bug #462144
 
   10 Jan 2013; Justin Bronder <jsbronder@gentoo.org> -openmpi-1.5.5.ebuild,
   -openmpi-1.6-r1.ebuild, -openmpi-1.6.1.ebuild, -openmpi-1.6.2.ebuild:
diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
index 0a97d2835f2c..c86475d28de0 100644
--- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.3.ebuild,v 1.17 2012/10/16 18:43:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.3.ebuild,v 1.18 2013/03/21 04:11:20 alexxy Exp $
 
 EAPI=3
 
@@ -97,6 +97,5 @@ src_install () {
 
 src_test() {
 	# Doesn't work with the default src_test as the dry run (-n) fails.
-	cd "${S}"
 	emake -j1 check || die "emake check failed"
 }
diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
new file mode 100644
index 000000000000..1903227d6c81
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.5.ebuild,v 1.1 2013/03/21 04:11:20 alexxy Exp $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs
+
+MY_P=${P/-mpi}
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="http://www.open-mpi.org"
+SRC_URI="http://www.open-mpi.org/software/ompi/v1.4/downloads/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+RESTRICT="mpi-threads? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
+RDEPEND="
+	pbs? ( sys-cluster/torque )
+	vt? (
+		!dev-libs/libotf
+		!app-text/lcdf-typetools
+	)
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	!sys-cluster/mpich2
+	!sys-cluster/mpiexec"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	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
+		--without-slurm)
+
+	if use mpi-threads; then
+		myconf+=(--enable-mpi-threads
+			--enable-progress-threads)
+	fi
+
+	if use fortran; then
+		if [[ $(tc-getFC) =~ g77 ]]; then
+			myconf+=(--disable-mpi-f90)
+		elif [[ $(tc-getFC) =~ if ]]; then
+			# Enabled here as gfortran compile times are huge with this enabled.
+			myconf+=(--with-mpi-f90-size=medium)
+		fi
+	else
+		myconf+=(--disable-mpi-f90 --disable-mpi-f77)
+	fi
+
+	! use vt && myconf+=(--enable-contrib-no-build=vt)
+
+	econf "${myconf[@]}" \
+		$(use_enable cxx mpi-cxx) \
+		$(use_enable romio io-romio) \
+		$(use_enable heterogeneous) \
+		$(use_with pbs tm) \
+		$(use_enable ipv6)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc README AUTHORS NEWS VERSION || die
+}
+
+src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check || die "emake check failed"
+}
diff --git a/sys-cluster/openmpi/openmpi-1.6.4.ebuild b/sys-cluster/openmpi/openmpi-1.6.4.ebuild
new file mode 100644
index 000000000000..d3ec3785833f
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.6.4.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6.4.ebuild,v 1.1 2013/03/21 04:11:20 alexxy Exp $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs versionator
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_dapl
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem
+	openmpi_fabrics_open-mx
+	openmpi_fabrics_psm
+	openmpi_fabrics_sctp"
+
+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_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="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads 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_rdmacm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
+
+RDEPEND="
+	!sys-cluster/mpich2
+	!sys-cluster/mpiexec
+	>=sys-apps/hwloc-1.3
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	openmpi_fabrics_dapl? ( sys-infiniband/dapl )
+	openmpi_fabrics_ofed? ( sys-infiniband/ofed )
+	openmpi_fabrics_knem? ( sys-cluster/knem )
+	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
+	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm )
+	openmpi_fabrics_sctp? ( net-misc/lksctp-tools )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm )
+	vt? (
+		!dev-libs/libotf
+		!app-text/lcdf-typetools
+	)
+	"
+DEPEND="${RDEPEND}"
+# TODO:  Newer releases of Vampir use otf2 which would resolve the above blockers.
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	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"
+		)
+
+	if use mpi-threads; then
+		myconf+=(
+			--enable-mpi-thread-multiple
+			--enable-opal-multi-threads
+			)
+	fi
+
+	if use fortran; then
+		if [[ $(tc-getFC) =~ g77 ]]; then
+			myconf+=(--disable-mpi-f90)
+		elif [[ $(tc-getFC) =~ if ]]; then
+			# Enabled here as gfortran compile times are huge with this enabled.
+			myconf+=(--with-mpi-f90-size=medium)
+		fi
+	else
+		myconf+=(--disable-mpi-f90 --disable-mpi-f77)
+	fi
+
+	! use vt && myconf+=(--enable-contrib-no-build=vt)
+
+	econf "${myconf[@]}" \
+		$(use_enable cxx mpi-cxx) \
+		$(use_enable romio io-romio) \
+		$(use_enable heterogeneous) \
+		$(use_enable ipv6) \
+		$(use_with openmpi_fabrics_dapl udapl "${EPREFIX}"/usr) \
+		$(use_with openmpi_fabrics_ofed openib "${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_dynamic-sl openib-dynamic-sl) \
+		$(use_enable openmpi_ofed_features_failover btl-openib-failover) \
+		$(use_with openmpi_fabrics_sctp sctp) \
+		$(use_with openmpi_rm_pbs tm) \
+		$(use_with openmpi_rm_slurm slurm)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+	# From USE=vt see #359917
+	rm "${ED}"/usr/share/libtool &> /dev/null
+	dodoc README AUTHORS NEWS VERSION || die
+}
+
+src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check || die "emake check failed"
+}