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

[Justin Lecher]

commit:     ea31a80dd59c6c2717dd6babbae015139ab6291a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 26 10:45:44 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 26 10:45:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ea31a80d

sys-cluster/mpich2: Move to EAPI=5, use fortran-2.eclass correctly

Package-Manager: portage-2.2.0_alpha141

---
 sys-cluster/mpich2/ChangeLog                 |    4 ++
 sys-cluster/mpich2/metadata.xml              |    4 +-
 sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild |   41 +++++++++++++------------
 sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild    |   41 ++++++++++++-------------
 4 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 39cb67f..6f093d8 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Oct 2012; Justin Lecher <jlec@g.o> mpich2-1.2.1_p1-r2.ebuild,
+  mpich2-1.4.1_p1.ebuild, metadata.xml:
+  Move to EAPI=5, use fortran-2.eclass correctly
+
   20 Apr 2012; Justin Bronder <jsbronder@g.o> mpich2-1.4.1_p1.ebuild:
   Fix docdir for prefix. Thanks to Robert McGehee for reporting.
 

diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml
index 27045b0..1738cc6 100644
--- a/sys-cluster/mpich2/metadata.xml
+++ b/sys-cluster/mpich2/metadata.xml
@@ -12,7 +12,7 @@
 		<description>Upstream Contact</description>
 	</maintainer>
 	<use>
-		<flag name='mpi-threads'>Enable MPI_THREAD_MULTIPLE</flag>
-		<flag name='romio'>Build the ROMIO MPI-IO component</flag>
+		<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.2.1_p1-r2.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
index eca3941..5b2ddd0 100644
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
@@ -1,25 +1,29 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
+
 PYTHON_DEPEND="2"
 
+FORTRAN_NEEDED=fortran
+
 inherit eutils fortran-2 mpi python toolchain-funcs
 
 MY_PV=${PV/_/}
-DESCRIPTION="MPICH2 - A portable MPI implementation"
+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"
 
-LICENSE="as-is"
 SLOT="0"
+LICENSE="as-is"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+cxx debug doc fortran mpi-threads romio threads"
 
 MPI_UNCLASSED_DEP_STR="!media-sound/mpd"
 
-COMMON_DEPEND="dev-libs/libaio
+COMMON_DEPEND="
+	dev-libs/libaio
 	romio? ( net-fs/nfs-utils )
 	$(mpi_imp_deplist)"
 
@@ -118,16 +122,13 @@ src_configure() {
 		--with-pm=mpd:hydra \
 		--disable-mpe \
 		$(use_enable romio) \
-		$(use_enable cxx) \
-		|| die
+		$(use_enable cxx)
 }
 
-src_compile() {
-	# Oh, the irony.
-	# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
-	# https://trac.mcs.anl.gov/projects/mpich2/ticket/297
-	emake -j1 || die
-}
+# Oh, the irony.
+# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
+# https://trac.mcs.anl.gov/projects/mpich2/ticket/297
+MAKEOPTS+=" -j1"
 
 src_test() {
 	local rc
@@ -154,17 +155,17 @@ src_install() {
 	local d=$(echo ${D}/$(mpi_root)/ | sed 's,///*,/,g')
 	local f
 
-	emake DESTDIR="${D}" install || die
+	default
 
 	dodir ${MPD_CONF_FILE_DIR}
 	insinto ${MPD_CONF_FILE_DIR}
-	doins "${FILESDIR}"/mpd.conf || die
+	doins "${FILESDIR}"/mpd.conf
 
 	mpi_dodir /usr/share/doc/${PF}
-	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die
-	mpi_newdoc src/pm/mpd/README README.mpd || die
+	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES
+	mpi_newdoc src/pm/mpd/README README.mpd
 	if use romio; then
-		mpi_newdoc src/mpi/romio/README README.romio || die
+		mpi_newdoc src/mpi/romio/README README.romio
 	fi
 
 	if ! use doc; then
@@ -188,10 +189,10 @@ pkg_postinst() {
 	chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
 	chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
 
-	elog ""
+	echo ""
 	elog "MPE2 has been removed from this ebuild and now stands alone"
 	elog "as sys-cluster/mpe2."
-	elog ""
+	echo ""
 
 	python_mod_optimize ${MPD_PYTHON_MODULES}
 }

diff --git a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
index 0a3903e..b9f91dd 100644
--- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
 inherit autotools eutils fortran-2 mpi toolchain-funcs versionator
 
 MY_PV=${PV/_/}
@@ -10,12 +13,13 @@ 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"
 
-LICENSE="as-is"
 SLOT="0"
+LICENSE="as-is"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="+cxx debug doc fortran mpi-threads romio threads"
 
-COMMON_DEPEND="dev-libs/libaio
+COMMON_DEPEND="
+	dev-libs/libaio
 	sys-apps/hwloc
 	romio? ( net-fs/nfs-utils )
 	$(mpi_imp_deplist)"
@@ -24,16 +28,13 @@ DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	sys-devel/libtool"
 
-RDEPEND="${COMMON_DEPEND}
-	fortran? ( virtual/fortran )"
+RDEPEND="${COMMON_DEPEND}"
 
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 pkg_setup() {
-	if use fortran; then
-		FORTRAN_STANDARD="77 90"
-		fortran-2_pkg_setup
-	fi
+	FORTRAN_STANDARD="77 90"
+	fortran-2_pkg_setup
 	MPI_ESELECT_FILE="eselect.mpi.mpich2"
 
 	if use mpi-threads && ! use threads; then
@@ -82,7 +83,7 @@ src_prepare() {
 	# 393361, backport of r8809 upstream.
 	epatch "${FILESDIR}"/mpich2-hvector.patch
 
-	AT_M4DIR="${S}"/confdb eautoreconf || die
+	AT_M4DIR="${S}"/confdb eautoreconf
 }
 
 src_configure() {
@@ -127,12 +128,10 @@ src_configure() {
 		$(use_enable fortran fc)
 }
 
-src_compile() {
-	# Oh, the irony.
-	# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
-	# https://trac.mcs.anl.gov/projects/mpich2/ticket/711
-	emake -j1
-}
+# Oh, the irony.
+# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
+# https://trac.mcs.anl.gov/projects/mpich2/ticket/711
+MAKEOPTS+=" -j1"
 
 src_test() {
 	# See #362655 and comments in the testlist files.
@@ -152,7 +151,7 @@ src_test() {
 		-e '/^[# ]*spawn/d' \
 		test/mpi/threads/testlist || die
 
-	emake -j1 \
+	emake \
 		CC="${S}"/bin/mpicc \
 		CXX="${S}"/bin/mpicxx \
 		F77="${S}"/bin/mpif77 \
@@ -163,13 +162,13 @@ src_test() {
 src_install() {
 	local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
 
-	emake -j1 DESTDIR="${D}" install
+	default
 
 	mpi_dodir /usr/share/doc/${PF}
-	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die
-	mpi_newdoc src/pm/hydra/README README.hydra || die
+	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES
+	mpi_newdoc src/pm/hydra/README README.hydra
 	if use romio; then
-		mpi_newdoc src/mpi/romio/README README.romio || die
+		mpi_newdoc src/mpi/romio/README README.romio
 	fi
 
 	if ! use doc; then