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

[Justin Lecher]

commit:     1ad0d056f30896b39db85b87000e4a399e925a32
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  4 16:22:42 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec  4 16:22:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1ad0d056

sys-cluster/mpich2: Drop old

Package-Manager: portage-2.2.7

---
 sys-cluster/mpich2/ChangeLog                 |   6 +-
 sys-cluster/mpich2/metadata.xml              |  28 ++--
 sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild | 202 ---------------------------
 sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild    | 179 ------------------------
 4 files changed, 19 insertions(+), 396 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 6c93d92..62400dc 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sys-cluster/mpich2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Dec 2013; Justin Lecher <jlec@g.o> -mpich2-1.2.1_p1-r2.ebuild,
+  -mpich2-1.4.1_p1.ebuild, metadata.xml:
+  Drop old
+
 *mpich2-1.5 (30 Oct 2012)
 
   30 Oct 2012; Justin Bronder <jsbronder@g.o> +mpich2-1.5.ebuild:

diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml
index 1738cc6..cd2dfc5 100644
--- a/sys-cluster/mpich2/metadata.xml
+++ b/sys-cluster/mpich2/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
-	<maintainer>
-		<email>jsbronder@g.o</email>
-		<name>Justin Bronder</name>
-	</maintainer>
-	<maintainer>
-		<email>balaji@×××××××.gov</email>
-		<name>Pavan Balaji</name>
-		<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>
-	</use>
+  <herd>cluster</herd>
+  <maintainer>
+    <email>jsbronder@g.o</email>
+    <name>Justin Bronder</name>
+  </maintainer>
+  <maintainer>
+    <email>balaji@×××××××.gov</email>
+    <name>Pavan Balaji</name>
+    <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>
+  </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
deleted file mode 100644
index 5b2ddd0..0000000
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_DEPEND="2"
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 mpi python toolchain-funcs
-
-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="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
-	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-2_pkg_setup
-	python_set_active_version 2
-	python_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() {
-	# Upstream trunk, r5843
-	epatch "${FILESDIR}"/0001-MPD_CONF_FILE-should-be-readable.patch
-	# Upstream trunk, r5844
-	epatch "${FILESDIR}"/0002-mpd_conf_file-search-order.patch
-	# Upstream trunk, r5845
-	epatch "${FILESDIR}"/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch
-	# Upstream trunk, r6848
-	epatch "${FILESDIR}"/mpich2-1.2.1-fix-missing-libs.patch
-
-	# We need f90 to include the directory with mods, and to
-	# fix hardcoded paths for src_test()
-	# Submitted upstream.
-	sed -i \
-		-e "s,F90FLAGS\( *\)=,F90FLAGS\1?=," \
-		-e "s,\$(bindir)/,${S}/bin/,g" \
-		-e "s,@MPIEXEC@,${S}/bin/mpiexec,g" \
-		$(find ./test/ -name 'Makefile.in') || die
-
-	if ! use romio; then
-		# These tests in errhan/ rely on MPI::File ...which is in romio
-		echo "" > test/mpi/errors/cxx/errhan/testlist
-	fi
-
-	# 293665:  Should check in on MPICH2_MPIX_FLAGS in later releases
-	# (>1.3) as this is seeing some development in trunk as of r6350.
-	sed -i \
-		-e 's|\(WRAPPER_[A-Z90]*FLAGS\)="@.*@"|\1=""|' \
-		src/env/mpi*.in || die
-}
-
-src_configure() {
-	local c="--enable-sharedlibs=gcc"
-	local romio_conf
-
-	# 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.
-
-	use debug && c="${c} --enable-g=all --enable-debuginfo"
-
-	if use mpi-threads; then
-		# MPI-THREAD requries threading.
-		c="${c} --with-thread-package=pthreads"
-		c="${c} --enable-threads=default"
-	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
-
-	# enable f90 support for appropriate compilers
-	case "$(tc-getFC)" in
-	    gfortran|if*)
-			c="${c} --enable-f77 --enable-f90";;
-	    g77)
-			c="${c} --enable-f77 --disable-f90";;
-	esac
-
-	! mpi_classed && c="${c} --sysconfdir=/etc/${PN}"
-	econf $(mpi_econf_args) ${c} ${romio_conf} \
-		--docdir=$(mpi_root)/usr/share/doc/${PF} \
-		--with-pm=mpd:hydra \
-		--disable-mpe \
-		$(use_enable romio) \
-		$(use_enable cxx)
-}
-
-# 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
-
-	cp "${FILESDIR}"/mpd.conf "${T}"/mpd.conf || die
-	chmod 600 "${T}"/mpd.conf
-	export MPD_CONF_FILE="${T}/mpd.conf"
-	"${S}"/bin/mpd --daemon --pid="${T}"/mpd.pid
-
-	make \
-		CC="${S}"/bin/mpicc \
-		CXX="${S}"/bin/mpicxx \
-		FC="${S}"/bin/mpif77 \
-		F90="${S}"/bin/mpif90 \
-		F90FLAGS="${F90FLAGS} -I${S}/src/binding/f90/" \
-		testing
-	rc=$?
-
-	"${S}"/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
-	return ${rc}
-}
-
-src_install() {
-	local d=$(echo ${D}/$(mpi_root)/ | sed 's,///*,/,g')
-	local f
-
-	default
-
-	dodir ${MPD_CONF_FILE_DIR}
-	insinto ${MPD_CONF_FILE_DIR}
-	doins "${FILESDIR}"/mpd.conf
-
-	mpi_dodir /usr/share/doc/${PF}
-	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
-	fi
-
-	if ! use doc; then
-		rm -rf "${d}"usr/share/doc/www*
-	else
-		mpi_dodir /usr/share/doc/${PF}/www
-		mv "${d}"usr/share/doc/www*/* "${d}"usr/share/doc/${PF}/www/
-	fi
-
-	mpi_imp_add_eselect
-
-	# See #316937
-	MPD_PYTHON_MODULES=""
-	for f in "${d}"usr/bin/*.py; do
-		MPD_PYTHON_MODULES="${MPD_PYTHON_MODULES} ${f##${d}}"
-	done
-}
-
-pkg_postinst() {
-	# Here so we can play with ebuild commands as a normal user
-	chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
-	chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
-
-	echo ""
-	elog "MPE2 has been removed from this ebuild and now stands alone"
-	elog "as sys-cluster/mpe2."
-	echo ""
-
-	python_mod_optimize ${MPD_PYTHON_MODULES}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${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
deleted file mode 100644
index b9f91dd..0000000
--- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools eutils fortran-2 mpi toolchain-funcs versionator
-
-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="as-is"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+cxx debug 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() {
-	# Cannot use bin/mpiexec as hydra is built by autotools and is
-	# a shell wrapped executable.
-	sed -i \
-		-e "s,@MPIEXEC@,${S}/src/pm/hydra/mpiexec.hydra,g" \
-		$(find ./test/ -name 'Makefile.in') || die
-
-	# #293665
-	# We could use MPICH2LIB_XFLAGS here and unset the cooresponding ones
-	# in the environment, however that's messy and doesn't for for LDFLAGS.
-	sed -i \
-		-e 's,\(.*=\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \
-		src/env/*.in || die
-
-	# See
-	# http://lists.mcs.anl.gov/pipermail/mpich-discuss/2011-August/010680.html
-	# http://lists.mcs.anl.gov/pipermail/mpich-discuss/2011-August/010678.html
-	# and countless other sources pointing out the insanity.
-	sed -i \
-		-e 's|prefix=${DESTDIR}|prefix=|g' \
-		-e 's|dir=${DESTDIR}|dir=|g' \
-		Makefile.in || die
-
-	sed -i \
-		-e "s|prefix='\${DESTDIR}|prefix='|" \
-		-e "s|dir='\${DESTDIR}|dir='|" \
-		src/env/Makefile.in || die
-
-	# 369263 and 1500 upstream.
-	epatch "${FILESDIR}"/fix-pkg-config-files.patch
-
-	# 393361, backport of r8809 upstream.
-	epatch "${FILESDIR}"/mpich2-hvector.patch
-
-	AT_M4DIR="${S}"/confdb eautoreconf
-}
-
-src_configure() {
-	local c="--enable-shared --disable-rpath"
-	local romio_conf
-
-	# 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.
-
-	use debug && c="${c} --enable-g=dbg --enable-debuginfo"
-
-	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
-
-	econf $(mpi_econf_args) ${c} ${romio_conf} \
-		--with-pm=hydra \
-		--disable-mpe \
-		--with-hwloc-prefix="${EPREFIX}/usr" \
-		--disable-fast \
-		--enable-smpcoll \
-		$(use_enable romio) \
-		$(use_enable cxx) \
-		$(use_enable fortran f77) \
-		$(use_enable fortran fc)
-}
-
-# 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.
-	# large_message:  only on machines with > 8gb of ram
-	# bcastlength:  This is an extension to MPI that's not necessary
-	# non_zero_root: performance test
-	# Also note that I/O tests may fail on non-local filesystems.
-	sed -i '/^[# ]*large_message/d' test/mpi/pt2pt/testlist || die
-	sed -i '/^[# ]*bcastlength/d' test/mpi/errors/coll/testlist || die
-	sed -i '/^[# ]*non_zero_root/d' test/mpi/perf/testlist || die
-
-	# Failing tests based on requiring MPI_THREAD_MULTIPLE.
-	# http://lists.mcs.anl.gov/pipermail/mpich-discuss/2012-January/011618.html
-	sed -i \
-		-e '/^[# ]*pt2pt/d' \
-		-e '/^[# ]*comm/d' \
-		-e '/^[# ]*spawn/d' \
-		test/mpi/threads/testlist || die
-
-	emake \
-		CC="${S}"/bin/mpicc \
-		CXX="${S}"/bin/mpicxx \
-		F77="${S}"/bin/mpif77 \
-		FC="${S}"/bin/mpif90 \
-		testing
-}
-
-src_install() {
-	local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
-
-	default
-
-	mpi_dodir /usr/share/doc/${PF}
-	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
-	fi
-
-	if ! use doc; then
-		rm -rf "${d}"usr/share/doc/${PF}/www*
-	fi
-
-	mpi_imp_add_eselect
-}