tweaks to mpich2

3 files changed, 26 insertions, 36 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index c117ec709..ec79f7ef6 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> mpich2-1.4.1_p1.ebuild:
+  Switch to EAPI4. Fixed license. Prefix love.
+
   10 Jan 2012; Justin Bronder <jsbronder@gentoo.org>
   +files/mpich2-hvector.patch, mpich2-1.4.1_p1.ebuild:
   Drop failing tests for now, fix #393361
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index f150e481b..5f5402260 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -14,16 +14,6 @@ AUX mpich2-hvector.patch 2011 RMD160 1abb8e8872fd7eb4e0c22ca5c499e8dce475a8c0 SH
 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 4702 RMD160 6df5bd94fe85ee16d0708a8c751dcf4fdf4ff057 SHA1 1847ade9ec0adec50bd5a650744b31c75ae3fce0 SHA256 ccd8a30848dc34d1c35995cd80661fb8bb62e3abc08635734e881da58e120563
-MISC ChangeLog 5601 RMD160 d8a414adb8883087a573543384ee25bb31695058 SHA1 cd7ed83163270871c38c17f315b1b0a45571a86e SHA256 85661b314d33580146a6d46118cc0b7dab1d364674c01a4c631ce801c82fc87e
+EBUILD mpich2-1.4.1_p1.ebuild 4714 RMD160 a49b7faa577677ee339e61d289aa44018d5a4418 SHA1 36684e8346a54050e2150cadc03d051d414daca8 SHA256 e091de691c7c7fddb619cc6bc44c759866b2302998424fd6e9621fb7d7bb1848
+MISC ChangeLog 5728 RMD160 c305f9e20d011642a1f21f24faf80aad982121d3 SHA1 b535528c38702ff0c4f7d4788afac2732b4ac95b SHA256 221798a06f715aa9c2503093cc46d794cdbc37f9256e9a304e7d1a9f6e538ac2
 MISC metadata.xml 534 RMD160 8d4fa7f5f4860a520e58b3866b2a2fdc04ab6d83 SHA1 60bc1b41a847e2f9fbf527b204fcafc054d04d33 SHA256 763dc9199c817bb987335dcdddcc65de5f419410aac2f027fc9a2208e91f5c0a
-<<<<<<< HEAD
-=======
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk8LqWcACgkQ4MrvBE1wQ8mXDwCdGUHb1DDbLcrtH/vSlSxQ+8p7
-ChAAnj4cGLejiVRe9HTyzVK9Gh2CgSiG
-=PZVk
------END PGP SIGNATURE-----
->>>>>>> Version bump
diff --git a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
index ab5e26ab4..6853722be 100644
--- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
@@ -2,21 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
-inherit autotools eutils fortran-2 mpi toolchain-funcs
+EAPI=4
+inherit autotools eutils fortran-2 mpi toolchain-funcs versionator
 
 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"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+cxx debug doc fortran mpi-threads romio threads"
+IUSE="+cxx debug doc fortran fortran90 mpi-threads romio threads"
 
 COMMON_DEPEND="dev-libs/libaio
-	>=sys-apps/hwloc-1.1.1
+	sys-apps/hwloc
 	romio? ( net-fs/nfs-utils )
 	$(mpi_imp_deplist)"
 
@@ -24,12 +24,16 @@ DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	sys-devel/libtool"
 
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	fortran? ( virtual/fortran )"
 
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 pkg_setup() {
-	fortran-2_pkg_setup
+	if use fortran; then
+		use fortran90 && FORTRAN_STANDARD="77 90"
+		fortran-2_pkg_setup
+	fi
 	MPI_ESELECT_FILE="eselect.mpi.mpich2"
 
 	if use mpi-threads && ! use threads; then
@@ -72,7 +76,7 @@ src_prepare() {
 		-e "s|dir='\${DESTDIR}|dir='|" \
 		src/env/Makefile.in || die
 
-	# 369263 and 1500 upstream. 	
+	# 369263 and 1500 upstream.
 	epatch "${FILESDIR}"/fix-pkg-config-files.patch
 
 	# 393361, backport of r8809 upstream.
@@ -82,7 +86,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local c="--enable-shared"
+	local c="--enable-shared --disable-rpath"
 	local romio_conf
 
 	# The configure statements can be somewhat confusing, as they
@@ -104,32 +108,25 @@ src_configure() {
 		c="${c} --enable-threads=single"
 	fi
 
-	# enable f90 support for appropriate compilers
-	case "$(tc-getFC)" in
-	    gfortran|if*)
-			c="${c} --enable-f77 --enable-fc";;
-	    g77)
-			c="${c} --enable-f77 --disable-fc";;
-	esac
-
-	! mpi_classed && c="${c} --sysconfdir=/etc/${PN}"
+	! mpi_classed && c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
 	econf $(mpi_econf_args) ${c} ${romio_conf} \
 		--docdir=$(mpi_root)/usr/share/doc/${PF} \
 		--with-pm=hydra \
 		--disable-mpe \
-		--with-hwloc-prefix=/usr \
+		--with-hwloc-prefix="${EPREFIX}/usr" \
 		--disable-fast \
 		--enable-smpcoll \
 		$(use_enable romio) \
 		$(use_enable cxx) \
-		|| die
+		$(use_enable fortran f77) \
+		$(use_enable fortran90 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 || die
+	emake -j1
 }
 
 src_test() {
@@ -158,9 +155,9 @@ src_test() {
 }
 
 src_install() {
-	local d=$(echo ${D}/$(mpi_root)/ | sed 's,///*,/,g')
+	local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
 
-	emake -j1 DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" install
 
 	mpi_dodir /usr/share/doc/${PF}
 	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die