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

Package-Manager: portage-2.2.0_alpha141

5 files changed, 49 insertions, 72 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 39cb67fd9..6f093d85d 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@gentoo.org> 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@gentoo.org> mpich2-1.4.1_p1.ebuild:
   Fix docdir for prefix. Thanks to Robert McGehee for reporting.
 
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 5126d110c..b68e1fb4a 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -1,29 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 0001-MPD_CONF_FILE-should-be-readable.patch 1496 RMD160 33b8db14ab69293a53ecb0192ea7a2a568ee422e SHA1 88cb1d7cc60a1eb7a2a7ea07c8058ebb3318c734 SHA256 747462d1d2272291fd956631cee4170112523027e2b89d4f2abf6d618cc004aa
-AUX 0002-mpd_conf_file-search-order.patch 3882 RMD160 90bf46695398bea605002826c7d9b85c7f07e5e9 SHA1 9f20b59f853e13d81f6227ddb16535d76ec4bab3 SHA256 a56c943e68e0bcf69900ae76cb4df73ef19d60f0e9e16e6d75d48b2651324b33
-AUX 0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch 1510 RMD160 8bcd0ec310bcbc13bfd3d0200c1b9f5a88fc4677 SHA1 949da42c2fa90c4a298dc37e0994e97317ae75e9 SHA256 84896b8c127a872fac3a99e9acdb41a2a051275399b186b54349a72d478acb00
-AUX 0003-Fix-pkgconfig-for-mpich2-ch3.patch 1488 RMD160 e521747ae9169be0cc2e7e6bc97f07d3cec29237 SHA1 4c4763fcfc91a3edfe9997a00d0222a5ee1efe73 SHA256 ddf570a0eb1c4bdedef4357ee82b5662ded3739928c4cda4b512d84ad7577488
-AUX eselect.mpi.mpich2 225 RMD160 0e43ee19f4468bf2dec1f3eb818d0e4c1fe7bb86 SHA1 d89d55089e26d8f949a4a9b8a72e20d0294b2f69 SHA256 433677c98927e92f669c410f6408dd16fc97d1f27599b551359a015989356ca5
-AUX fix-pkg-config-files.patch 5217 RMD160 5d80259379276e57fbf0f342ec1023aa8c339ba5 SHA1 7e97656f030c7f8b512b050592ccba775ac57806 SHA256 fa8c48e38725432f944c1a4d09238a31338c40dcdca1a0273f9ebc44e2392c44
-AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf4ff269e4489d5cc7c3577c6c1fa6b SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4
-AUX mpich2-1.0.8-gforker-install-alt-fix.patch 621 RMD160 5b9904ae02f1c1098fdfd2dc4717610f89469afd SHA1 a33bcefa87d990a678436ebfac70976069a7f90d SHA256 a79e469b08e0a3f6c17ec7ec7ea01d3a56a553803fefd24f3794237eead36ced
-AUX mpich2-1.0.8-mpdconf-env.patch 5355 RMD160 26ffada537073676553fdc4a9ee6a02f1a1af279 SHA1 f40eee99425894d9c76c8eefa87b8e72d9b7a02a SHA256 14cbd73be6969569574a880ad23e7c71c4bb02e6994392b2661bf5fb1965ce3d
-AUX mpich2-1.0.8-pkgconfig.patch 928 RMD160 5ce7a800423f250dba0dd69560abebf845e7e556 SHA1 afba6883d1204a4b7c082af7e976186153263d64 SHA256 7f8dcafcb0d138130a684284d9bca86e4834f74a5132f0fef4556391abf43f8e
-AUX mpich2-1.2.1-fix-missing-libs.patch 1825 RMD160 aec1251aa66f0d63c5848920c63339d5558a0f61 SHA1 d70695c63d891a32a98324ffd236f8751465fe98 SHA256 f645d00fc6adeef553517078dcc3313cbabfbf8069ad5a76e2570d183b2d824b
-AUX mpich2-1.3-libtvmpich2.so-respect-user-LDFLAGS.patch 1053 RMD160 e38a0c503bde8b66cd1d7efbeb674f14e0008a8d SHA1 f5691827c39a9bbf01c4c7e13d5fdf4aa1774558 SHA256 a0e79be986c29cc5aa1b0abb1bba27dc368a530d632a332e8701e9c02967224e
-AUX mpich2-hvector.patch 2011 RMD160 1abb8e8872fd7eb4e0c22ca5c499e8dce475a8c0 SHA1 ebf8a0cabb9e3debf0a0d55a736f23880b91a995 SHA256 c6e7b522f1dd6d7a4936e44fc63bebefbdb1d6d6138b07cddc35609057b6ca34
-DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
-DIST mpich2-1.4.1p1.tar.gz 19502854 RMD160 1d355cc07b8675af77b1c255fd10696844447298 SHA1 8dcc8888fb27232eb8f76c11cc890f1c3c483804 SHA256 a20f798ceaad6b0161ddecac98623b65d6a4033072f39ced13b9043916e3d1ee
-EBUILD mpich2-1.2.1_p1-r2.ebuild 5030 RMD160 b947f8a8fa374d4e49a407d212a61fdd20986e61 SHA1 264fa061d136685befd2637272510b2298f05ccb SHA256 48abd33f82ce7728c4fe2010c58fce7718e0e50ff0242f4d44d4781532a51a43
-EBUILD mpich2-1.4.1_p1.ebuild 4841 RMD160 18cc940fdbdbd53d3b9d246ee41557827b4a6597 SHA1 1bf50f4fbd9278b3f7445f6c8371babd078c60dd SHA256 4f9c7b11e7f20b05020a238f0f5129fcb56ea3d7f400b09d1f1b44f993c85701
-MISC ChangeLog 6021 RMD160 c5d150b5a75f75f1302707d6b97943960da4848a SHA1 ce1f2b26dd1920a1b9b6bb87dc39e0ffb817d023 SHA256 7349a3ebc5e73f6492fd39e1ada8da127b7596e9fb8f6ae6eb07a744fb77e239
-MISC metadata.xml 534 RMD160 8d4fa7f5f4860a520e58b3866b2a2fdc04ab6d83 SHA1 60bc1b41a847e2f9fbf527b204fcafc054d04d33 SHA256 763dc9199c817bb987335dcdddcc65de5f419410aac2f027fc9a2208e91f5c0a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk+R5hkACgkQ4MrvBE1wQ8nDUACgpfsc69NZyhZQKX5f9iZMgpfu
-uYIAnjV7N6TBTp3Wpfb+cYc3duHk4iCh
-=9LTt
------END PGP SIGNATURE-----
+DIST mpich2-1.2.1p1.tar.gz 18014859 SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
+DIST mpich2-1.4.1p1.tar.gz 19502854 SHA256 a20f798ceaad6b0161ddecac98623b65d6a4033072f39ced13b9043916e3d1ee
diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml
index 27045b029..1738cc60e 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 eca3941fc..5b2ddd0d3 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 0a3903edf..b9f91ddb6 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